Fix command line parsing