Changes to fix cmdline usage