Fix zone into cmds[1] in few places