Minor tweaks in order to create a NuGet pkg