Fix visibility issues