diff --git a/cmake/Bitmaps.cmake b/cmake/Bitmaps.cmake
index 145aeff0f..cd5e04307 100644
--- a/cmake/Bitmaps.cmake
+++ b/cmake/Bitmaps.cmake
@@ -20,5 +20,5 @@ macro(add_truetype_font_target radio name font size bold)
     COMMAND ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
     WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
   )
-  set(ttf_horus_fonts_targets ${ttf_horus_fonts_targets} ttf_${radio}_${name})
+  set(ttf_${radio}_fonts_targets ${ttf_${radio}_fonts_targets} ttf_${radio}_${name})
 endmacro(add_truetype_font_target)
\ No newline at end of file
diff --git a/companion/src/logsdialog.cpp b/companion/src/logsdialog.cpp
index 54828db67..d9e51e8fa 100644
--- a/companion/src/logsdialog.cpp
+++ b/companion/src/logsdialog.cpp
@@ -1070,7 +1070,9 @@ void LogsDialog::addMaxAltitudeMarker(const coords & c, QCPGraph * graph) {
   tracerMaxAlt->updatePosition();
 }
 
-void LogsDialog::countNumberOfThrows(const coords & c, QCPGraph * graph) {
+void LogsDialog::countNumberOfThrows(const coords & c, QCPGraph * graph)
+{
+#if 0
   // find all launches
   // TODO
   double startTime = c.x.at(0);
@@ -1079,6 +1081,7 @@ void LogsDialog::countNumberOfThrows(const coords & c, QCPGraph * graph) {
     double alt = c.y.at(i);
     double time = c.x.at(i);
   }
+#endif
 }
 
 void LogsDialog::addCursor(QCPItemTracer ** cursor, QCPGraph * graph, const QColor & color) {
diff --git a/radio/src/fonts/horus/CMakeLists.txt b/radio/src/fonts/horus/CMakeLists.txt
index 4d6512310..139d296b7 100644
--- a/radio/src/fonts/horus/CMakeLists.txt
+++ b/radio/src/fonts/horus/CMakeLists.txt
@@ -7,4 +7,5 @@ add_truetype_font_target(horus stdsizebold ${FONT} 16 True)
 add_truetype_font_target(horus midsize ${FONT} 24 False)
 add_truetype_font_target(horus dblsize ${FONT} 32 True)
 add_truetype_font_target(horus xxlsize ${FONT} 48 False)
+
 add_custom_target(ttf_horus_fonts DEPENDS ${ttf_horus_fonts_targets})
diff --git a/radio/src/gui/gui_helpers.cpp b/radio/src/gui/gui_helpers.cpp
index ac06f5736..e5b7eb13b 100644
--- a/radio/src/gui/gui_helpers.cpp
+++ b/radio/src/gui/gui_helpers.cpp
@@ -230,7 +230,7 @@ bool isInputSourceAvailable(int source)
 
   if (source>=MIXSRC_FIRST_CH && source<=MIXSRC_LAST_CH)
     return true;
-    
+
   if (source>=MIXSRC_FIRST_LOGICAL_SWITCH && source<=MIXSRC_LAST_LOGICAL_SWITCH) {
     LogicalSwitchData * cs = lswAddress(source-MIXSRC_SW1);
     return (cs->func != LS_FUNC_NONE);
@@ -467,6 +467,12 @@ bool isSourceAvailableInResetSpecialFunction(int index)
   }
 }
 
+#if defined(PCBFLAMENCO)
+bool isModuleAvailable(int module)
+{
+    return true;
+}
+#else
 bool isModuleAvailable(int module)
 {
 #if defined(CROSSFIRE)
@@ -476,6 +482,7 @@ bool isModuleAvailable(int module)
 #endif
   return true;
 }
+#endif
 
 bool isRfProtocolAvailable(int protocol)
 {
diff --git a/radio/src/gui/horus/radio_calibration.cpp b/radio/src/gui/horus/radio_calibration.cpp
index dec970227..58283eee2 100644
--- a/radio/src/gui/horus/radio_calibration.cpp
+++ b/radio/src/gui/horus/radio_calibration.cpp
@@ -170,7 +170,7 @@ bool menuCommonCalib(evt_t event)
       // MOVE STICKS/POTS
       lcdDrawText(50, 3, STR_MENUCALIBRATION, MENU_TITLE_COLOR);
       lcdDrawText(50, 3+FH, STR_MOVESTICKSPOTS, MENU_TITLE_COLOR);
-      for (int i=0; i<NUM_STICKS+NUM_POTS+NUM_MOUSE_ANALOGS; i++) {
+      for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_MOUSE_ANALOGS; i++) {
         if (abs(reusableBuffer.calib.loVals[i]-reusableBuffer.calib.hiVals[i]) > 50) {
           g_eeGeneral.calib[i].mid = reusableBuffer.calib.midVals[i];
           int16_t v = reusableBuffer.calib.midVals[i] - reusableBuffer.calib.loVals[i];