Few fixes, Nuget Test5