Overlay window fixes