diff --git a/source/common/common.h b/source/common/common.h
index 40d2747..79e805b 100644
--- a/source/common/common.h
+++ b/source/common/common.h
@@ -37,9 +37,6 @@
 #define align(v,a) \
     (((v) % (a)) ? ((v) + (a) - ((v) % (a))) : (v))
 
-#define ENTRY_BRAHMA        (1)
-#define ENTRY_GATEWAY       (2)
-
 // GodMode9 / SafeMode9 ("flavor" / splash screen)
 #ifndef SAFEMODE
 #define FLAVOR "GodMode9"
@@ -96,10 +93,9 @@
 #define VCART_BUFFER        ((u8*)0x21600000)
 #define VCART_BUFFER_SIZE   (0x20000) // 128kB, this is more than enough
 // buffer area defines (in use by image.c, for RAMdrive)
-#define RAMDRV_BUFFER_O3DS  ((u8*)0x22200000) // in O3DS FCRAM
-#define RAMDRV_SIZE_O3DS    (0x01C00000) // 28MB
-#define RAMDRV_BUFFER_N3DS  ((u8*)0x28000000) // in N3DS FCRAM
-#define RAMDRV_SIZE_N3DS    (0x08000000) // 128MB
+#define RAMDRV_BUFFER       ((u8*)0x24000000) // top half of FCRAM
+#define RAMDRV_SIZE_O3DS    (0x04000000) // 64MB
+#define RAMDRV_SIZE_N3DS    (0x0C000000) // 192MB
 
 inline u32 strchrcount(const char* str, char symbol) {
     u32 count = 0;
diff --git a/source/fatfs/ramdrive.c b/source/fatfs/ramdrive.c
index c9c38e1..aed5ed2 100644
--- a/source/fatfs/ramdrive.c
+++ b/source/fatfs/ramdrive.c
@@ -26,11 +26,6 @@ u64 GetRamDriveSize(void) {
 }
 
 void InitRamDrive(void) {
-    if (IS_O3DS) {
-        ramdrv_buffer = RAMDRV_BUFFER_O3DS;
-        ramdrv_size = RAMDRV_SIZE_O3DS;
-    } else {
-        ramdrv_buffer = RAMDRV_BUFFER_N3DS;
-        ramdrv_size = RAMDRV_SIZE_N3DS;
-    }
+    ramdrv_buffer = RAMDRV_BUFFER;
+    ramdrv_size = IS_O3DS ? RAMDRV_SIZE_O3DS : RAMDRV_SIZE_N3DS;
 }
\ No newline at end of file
diff --git a/source/start.s b/source/start.s
index 0863a68..cc9d0cc 100644
--- a/source/start.s
+++ b/source/start.s
@@ -142,7 +142,7 @@ _skip_gw:
     mov r1, #0x340
     str r1, [r0]
 
-    mov sp, #0x27000000
+    ldr sp, =0x23F00000
 
     blx main
     b _start