Fixed issues with several subcommands