msbuild fixes, untested