more case fixing for xbuild