Actually fix commands