Continued packaging tweaks for nuget