Changed visibility of some functions