(*) Minor updates for publishing to Nuget