Finally fix overlays