Overlay improvements. Ref #8