Fix getOperand issues