Some class visibility minor tweaks