Rejig bounding box size calcs