Fix cmd_types