fix overlay build errors ville & evita