Adjust the visibility of several functions to override