Fix imports (again)
Fix octree errors. Untested.