XBuild related issues fixed