Minor changes to class visibility