More nuget packages fixes