fixes to operator