Overlay changes to fix build