Fix accessibility of some classes