Fixed command line arg parsing