Fixed more build warnings, xbuild