Updated nuget packaged and minor fixes