Fixed cmdline handling.