Fix the MapCommands