Fixed some stuff with the arguments