Fixed a few untested arguments