mkottman (hopefully) Fix the default arguments for more specific cases