Fix failing specs in overlays.