diff --git a/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c
index 4b22b85c09..c42f56b0b3 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c
@@ -31,13 +31,13 @@ static unsigned int current_battery_level = 100;
 /* This specifies the battery level that writes are still safe */
 const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
 {
-    1
+    5
 };
 
 /* Below this the player cannot be considered to operate reliably */
 const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
 {
-    0
+    4
 };
 
 /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index abdca21627..267fbd46af 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -374,6 +374,11 @@ void system_init(void)
 
     i2c_init();
     avr_hid_init();
+
+#ifndef BOOTLOADER
+    /* Disable External Memory interface (used for accessing NOR flash) */
+    bitclr16(&IO_CLK_MOD0, CLK_MOD0_EMIF);
+#endif
 #endif
 }