Fix visibility for MoP