Some minor changes to get the commandline parameters right