Fixing some annoying things about various commands