diff --git a/Source/Engine/Render2D/Font.cpp b/Source/Engine/Render2D/Font.cpp
index b50a3b1c2..cbc40a227 100644
--- a/Source/Engine/Render2D/Font.cpp
+++ b/Source/Engine/Render2D/Font.cpp
@@ -231,7 +231,7 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
         lastMoveLine = moveLine;
     }
 
-    if (tmpLine.LastCharIndex >= tmpLine.FirstCharIndex || text[textLength - 1] == '\n')
+    if (textLength != 0 && (tmpLine.LastCharIndex >= tmpLine.FirstCharIndex || text[textLength - 1] == '\n'))
     {
         // Add line
         tmpLine.Size.X = cursorX;
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
index e8f98d401..a5cf4e8c6 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
@@ -238,7 +238,7 @@ namespace Flax.Build.Bindings
                 result = FindApiTypeInfoInner(buildData, typeInfo, e.Value);
                 if (result != null)
                 {
-                    buildData.TypeCache.Add(typeInfo, result);
+                    buildData.TypeCache[typeInfo] = result;
                     return result;
                 }
             }