Fix accessibility of private variables