Changed visibility of some fields/methods