Fix errors with trailing arg