Subcmd fixes