Fixes arg locations