Fix cmdline
Gets fixes