Fixed NuGet issues