Changes in prep for NuGet release