Fixed build & nuget generation