Overlay home fixes