operations controll fixes