Fixing issue with subcommands and --help