Fix command line parameters, etc.