fix require/base functions