Client and walkOperand fixes