Operator token fixes