Change visibility of some methods to fix compilation errors