More Nuget-fixes