Octree performance improvements

This saves the Wolfdale