[xbuild] Fix %Identity issues