More fixes to BoundingBox