fixes and nuget change