NuGet fixes