Bounding box fixes.