More nuget fixes