overlay fixups part 1