diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp
index 304e99b7bc..c6d381bcf7 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/core/fsio_impl.cpp
@@ -249,7 +249,7 @@ static void handleFsio(Engine *engine, int index) {
 
 
 static const char * action2String(le_action_e action) {
-	static char buffer[10];
+	static char buffer[_MAX_FILLER];
 	switch(action) {
 		case LE_METHOD_RPM:
 			return "RPM";
diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp
index 43f34ba3c0..377c349151 100644
--- a/firmware/controllers/trigger/rpm_calculator.cpp
+++ b/firmware/controllers/trigger/rpm_calculator.cpp
@@ -230,7 +230,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType,
 
 static scheduling_s tdcScheduler[2];
 
-static char rpmBuffer[10];
+static char rpmBuffer[_MAX_FILLER];
 
 #if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
 /**
diff --git a/firmware/hw_layer/mmc_card.cpp b/firmware/hw_layer/mmc_card.cpp
index e5429a02a4..735442e9ee 100644
--- a/firmware/hw_layer/mmc_card.cpp
+++ b/firmware/hw_layer/mmc_card.cpp
@@ -85,7 +85,7 @@ static void printError(const char *str, FRESULT f_error) {
 static FIL FDLogFile;
 static FIL FDCurrFile;
 static int logFileIndex = 1;
-static char logName[20];
+static char logName[_MAX_FILLER + 20];
 
 static int totalLoggedBytes = 0;
 
@@ -109,7 +109,7 @@ static void incLogFileName(void) {
 	memset(&FDCurrFile, 0, sizeof(FIL));						// clear the memory
 	FRESULT err = f_open(&FDCurrFile, LOG_INDEX_FILENAME, FA_READ);				// This file has the index for next log file name
 
-	char data[10];
+	char data[_MAX_FILLER];
 	UINT result = 0;
 	if (err != FR_OK && err != FR_EXIST) {
 			logFileIndex = 1;
diff --git a/firmware/hw_layer/rtc_helper.cpp b/firmware/hw_layer/rtc_helper.cpp
index c7115789d2..72dee4b5e4 100644
--- a/firmware/hw_layer/rtc_helper.cpp
+++ b/firmware/hw_layer/rtc_helper.cpp
@@ -33,7 +33,8 @@ void date_get_tm(struct tm *timp) {
 }
 
 static void put2(int offset, char *lcd_str, int value) {
-	static char buff[4];
+	static char buff[_MAX_FILLER];
+	efiAssertVoid(value >=0 && value <100, "value");
 	itoa10(buff, value);
 	if (value < 10) {
 		lcd_str[offset] = '0';