Nuget Fixes