fixes in operators processing