Fixing all references to invalid-arg