Fix cmdline helpers