Initial commit
Nuget fixes