2 files changed, 11 insertions, 6 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index ba0114774d..c0a476dc10 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1601,12 +1601,10 @@ static bool view_battery(void)
                 lcd_putsf(0, 7, "Headphone: %s",
                          headphone ? "connected" : "disconnected");
 #ifdef IPOD_VIDEO
-                x = (adc_read(ADC_4066_ISTAT) * 2400) /
-#if MEM == 64
-                (1024 * 2);
-#else
-                (1024 * 3);
-#endif
+                if(probed_ramsize == 64)
+                    x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 2);
+                else
+                    x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 3);
                 lcd_putsf(0, 8, "Ibat: %d mA", x);
                 lcd_putsf(0, 9, "Vbat * Ibat: %d mW", x * y / 1000);
 #endif
diff --git a/apps/main.c b/apps/main.c
index ceaa85f38f..0c2f0751b3 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -422,6 +422,13 @@ static void init(void)
 #endif
 
     system_init();
+#if defined(IPOD_VIDEO)
+    audiobufend=(unsigned char *)audiobufend_lds;
+    if(MEM==64 && probed_ramsize!=64)
+    {
+        audiobufend -= (32<<20);
+    }
+#endif
     kernel_init();
 
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ