Fix command line args parsing