Overlay fixes