Fix command line handling