Correct some problems related to custom basepaths