Operator fixes