Fixes to the operators.
Merge pull request #1137 from akarnokd/OperatorFixes430

Fixes to the operators.