Use correct command line options