Some minor fixes to make the build work more universally
Merge branch 'anurse/minorbuildtweaks'

Conflicts:
	.nuget/NuGet.targets