Tidy up bounding boxes
Fix gson