Minor improvements to overlays management.