Overlay: fixed mismatches