Added mode checks for ++ cmds