Fix command line parser