Fix the commands