diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 87b11bef00..144e0a4a0f 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -554,11 +554,6 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
 	initSensorChart();
 #endif /* EFI_SENSOR_CHART */
 
-
-#if EFI_TUNER_STUDIO
-	startTunerStudioConnectivity();
-#endif /* EFI_TUNER_STUDIO */
-
 #if EFI_PROD_CODE || EFI_SIMULATOR
 	initSettings();
 
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 74b864b53a..c87386671b 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -39,7 +39,6 @@
 #include "mcp3208.h"
 #include "hip9011.h"
 #include "histogram.h"
-#include "mmc_card.h"
 #include "neo6m.h"
 #include "lcd_HD44780.h"
 #include "settings.h"
@@ -249,7 +248,7 @@ void adc_callback_fast(ADCDriver *adcp) {
 #endif /* HAL_USE_ADC */
 
 static void calcFastAdcIndexes(void) {
-#if HAL_USE_ADC
+#if HAL_USE_ADC && EFI_USE_FAST_ADC
 	fastMapSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->map.sensor.hwChannel];
 	hipSampleIndex =
 			isAdcChannelValid(engineConfiguration->hipOutputChannel) ?
@@ -594,10 +593,6 @@ void initHardware(Logging *l) {
 	initHip9011(sharedLogger);
 #endif /* EFI_HIP_9011 */
 
-#if EFI_FILE_LOGGING
-	initMmcCard();
-#endif /* EFI_FILE_LOGGING */
-
 #if EFI_MEMS
 	initAccelerometer(PASS_ENGINE_PARAMETER_SIGNATURE);
 #endif
diff --git a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.c b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.c
index 5d4cb580e5..d357b93af7 100644
--- a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.c
+++ b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.c
@@ -40,7 +40,7 @@ void usb_serial_start(void) {
 // See also https://github.com/rusefi/rusefi/issues/705
 #ifndef EFI_SKIP_USB_DISCONNECT
 	usbDisconnectBus(serusbcfg.usbp);
-	chThdSleepMilliseconds(1500);
+	chThdSleepMilliseconds(250);
 #endif/* EFI_SKIP_USB_DISCONNECT */
 	usbStart(serusbcfg.usbp, &usbcfg);
 	usbConnectBus(serusbcfg.usbp);
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 28c082f1f2..9b76866847 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -124,6 +124,8 @@
 #include "custom_engine.h"
 #include "engine_math.h"
 #include "mpu_util.h"
+#include "tunerstudio.h"
+#include "mmc_card.h"
 
 #if EFI_HD44780_LCD
 #include "lcd_HD44780.h"
@@ -213,11 +215,19 @@ void runRusEfi(void) {
 	 */
 	initializeConsole(&sharedLogger);
 
+#if EFI_TUNER_STUDIO
+	startTunerStudioConnectivity();
+#endif /* EFI_TUNER_STUDIO */
+
 	/**
 	 * Initialize hardware drivers
 	 */
 	initHardware(&sharedLogger);
 
+#if EFI_FILE_LOGGING
+	initMmcCard();
+#endif /* EFI_FILE_LOGGING */
+
 	initStatusLoop();
 	/**
 	 * Now let's initialize actual engine control logic