More msbuild updates