Fix command line options