Fix the commandline changes