Some fixes on operator module support