Fixed command line parsing