Add back missing overlays and other updates