NuGet updates + small fix