Fixes some lingering effects of removing rtree