Nuget gen tweaks