Fix nuspec files and Nuget generation