Fixed annoying argument bugs