Fixes regressions from BVH