Fix options for subcommands