Bug fixes and NuGet publish