Fixed visibility of some internal methods