Fix overlays in small container mode
Merge prior to push