Fixup visibility