fix some breakage from the CLI command changes