Fix cmds