diff --git a/radio/src/curves.cpp b/radio/src/curves.cpp
index 58fec069e..fa7a66b39 100644
--- a/radio/src/curves.cpp
+++ b/radio/src/curves.cpp
@@ -49,6 +49,11 @@ void loadCurves()
       case CURVE_TYPE_CUSTOM:
         tmp += 8+2*g_model.curves[i].points;
         break;
+      default:
+        TRACE("Wrong curve type! Fixing...");
+        g_model.curves[i].type = CURVE_TYPE_STANDARD;
+        tmp += 5+g_model.curves[i].points;
+        break;
     }
     curveEnd[i] = tmp;
   }
@@ -299,6 +304,9 @@ int applyCurve(int x, CurveRef & curve)
 
 int applyCustomCurve(int x, uint8_t idx)
 {
+  if (idx >= MAX_CURVES)
+    return 0;
+
   CurveInfo &crv = g_model.curves[idx];
   if (crv.smooth)
     return hermite_spline(x, idx);
diff --git a/radio/src/fonts/.gitignore b/radio/src/fonts/.gitignore
index 2acf3f6bf..cb250d1fc 100644
--- a/radio/src/fonts/.gitignore
+++ b/radio/src/fonts/.gitignore
@@ -2,3 +2,4 @@
 /font_dblsize.png
 /font_midsize.png
 /font_stdsize.png
+/font_tinsize.png