Improvements to bounding box.