nuget and fixes