Some msbuild tweaks