Fix config file / command line interactions (?).