couple of argument tweaks