Fix up root helper and some borked cmds