Patches to fix overlap/size of boxes.