Fix command line handling.