Fix up overlays