changed visibility of some package private methods