MSBuild script tweaks