diff --git a/firmware/config/stm32h7ems/chconf.h b/firmware/config/stm32h7ems/chconf.h
index 1ca8de94bd..d09fe9ab5f 100644
--- a/firmware/config/stm32h7ems/chconf.h
+++ b/firmware/config/stm32h7ems/chconf.h
@@ -38,6 +38,8 @@
  */
 /*===========================================================================*/
 
+#include "chconf_common.h"
+
 /**
  * @brief   System time counter resolution.
  * @note    Allowed values are 16, 32 or 64 bits.
@@ -80,7 +82,7 @@
  *          this value.
  */
 #if !defined(CH_CFG_ST_TIMEDELTA)
-#define CH_CFG_ST_TIMEDELTA                 2
+#define CH_CFG_ST_TIMEDELTA                 0
 #endif
 
 /** @} */
@@ -642,24 +644,6 @@
   /* Add threads initialization code here.*/                                \
 }
 
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p thread_t structure.
- */
-#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
-  /* Add threads custom fields here.*/
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p _thread_init() function.
- *
- * @note    It is invoked from within @p _thread_init() and implicitly from all
- *          the threads creation APIs.
- */
-#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
-  /* Add threads initialization code here.*/                                \
-}
-
 /**
  * @brief   Threads finalization hook.
  * @details User finalization code added to the @p chThdExit() API.
@@ -668,28 +652,6 @@
   /* Add threads finalization code here.*/                                  \
 }
 
-/**
- * @brief   Context switch hook.
- * @details This hook is invoked just before switching between threads.
- */
-#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
-  /* Context switch code here.*/                                            \
-}
-
-/**
- * @brief   ISR enter hook.
- */
-#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
-  /* IRQ prologue code here.*/                                              \
-}
-
-/**
- * @brief   ISR exit hook.
- */
-#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
-  /* IRQ epilogue code here.*/                                              \
-}
-
 /**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
diff --git a/firmware/config/stm32h7ems/efifeatures.h b/firmware/config/stm32h7ems/efifeatures.h
index 47039d3dc6..7891f85599 100644
--- a/firmware/config/stm32h7ems/efifeatures.h
+++ b/firmware/config/stm32h7ems/efifeatures.h
@@ -18,6 +18,9 @@
 #define BOARD_MC33972_COUNT	0
 #define BOARD_TLE8888_COUNT 	0
 
+#undef EFI_MAX_31855
+#define EFI_MAX_31855 FALSE
+
 #undef BOARD_EXT_GPIOCHIPS
  #define BOARD_EXT_GPIOCHIPS			(BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT + BOARD_DRV8860_COUNT + BOARD_MC33810_COUNT)
 
diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp
index 6a61528bca..8ee4f6af5b 100644
--- a/firmware/hw_layer/pin_repository.cpp
+++ b/firmware/hw_layer/pin_repository.cpp
@@ -149,12 +149,13 @@ static void reportPins(void) {
 }
 
 void printSpiConfig(Logging *logging, const char *msg, spi_device_e device) {
+#if HAL_USE_SPI
 	scheduleMsg(logging, "%s %s mosi=%s", msg, getSpi_device_e(device), hwPortname(getMosiPin(device)));
 	scheduleMsg(logging, "%s %s miso=%s", msg, getSpi_device_e(device), hwPortname(getMisoPin(device)));
 	scheduleMsg(logging, "%s %s sck=%s",  msg, getSpi_device_e(device), hwPortname(getSckPin(device)));
+#endif // HAL_USE_SPI
 }
 
-
 const char *hwPortname(brain_pin_e brainPin) {
 	if (brainPin == GPIO_INVALID) {
 		return "INVALID";