Fixed command line options