Merge "Fix various problems in opcontrol"