Fix command line arg parsing