Fixed some Nuget package issues