fixes for xbuild