Fixup some compilation errors (overlays)