overlay management fixes