Small fixes for overlays