Fix NuGet and clean solution