diff --git a/firmware/baseband/dsp_goertzel.hpp b/firmware/baseband/dsp_goertzel.hpp
index 65cf5b1d..a0f620cd 100644
--- a/firmware/baseband/dsp_goertzel.hpp
+++ b/firmware/baseband/dsp_goertzel.hpp
@@ -35,7 +35,7 @@ class GoertzelDetector {
 
    private:
     float coefficient{};
-    int16_t s[2]{0};
+    int16_t s[3]{0};
 };
 
 } /* namespace dsp */
diff --git a/firmware/chibios-portapack/ext/fatfs/src/ff.c b/firmware/chibios-portapack/ext/fatfs/src/ff.c
index fa9c50f3..862f0a56 100644
--- a/firmware/chibios-portapack/ext/fatfs/src/ff.c
+++ b/firmware/chibios-portapack/ext/fatfs/src/ff.c
@@ -1835,7 +1835,7 @@ void gen_numname (
 		if (c > '9') c += 7;
 		ns[i--] = c;
 		seq /= 16;
-	} while (seq);
+	} while (seq && i != 0);
 	ns[i] = '~';
 
 	/* Append the number */