Fixing Nuget issues