Fix NuGet Issues