Make changes required by the lib refactoring