some fixes for overlays