Fix class visibility