Build and nuspec fixes for #632