Fix visibility classes