Fixed nuget packages. Other minor changes