Nuget fixes