Fixed NuGet/NuGetGallery#1917 by fixing up the little bugs

Fixes NuGet/NuGetGallery#1917