Fixing some inconsistencies in Overlay configuration flagged up in !61936 (closed).
Tagging @tadej and @tbold.