diff --git a/src/audio/mixer.c b/src/audio/mixer.c
index 12e53e779..ecb56e050 100644
--- a/src/audio/mixer.c
+++ b/src/audio/mixer.c
@@ -16,9 +16,9 @@
 #define ROUND_DOWN_16(v) ((v) & ~0xf)
 
 //#define DMEM_BUF_SIZE (0x1000 - 0x0330 - 0x10 - 0x40)
-#define DMEM_BUF_SIZE 0xE80
-#define BUF_U8(a) (rspa.buf.as_u8 + ((a) - 0x1A0))
-#define BUF_S16(a) (rspa.buf.as_s16 + ((a) - 0x1A0) / sizeof(int16_t))
+#define DMEM_BUF_SIZE 0xC80
+#define BUF_U8(a) (rspa.buf.as_u8 + (a))
+#define BUF_S16(a) (rspa.buf.as_s16 + (a) / sizeof(int16_t))
 
 static struct {
     uint16_t in;
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index ed85998c4..66faebeb1 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -62,7 +62,7 @@ GameEngine::GameEngine() {
         }
     }
 
-    this->context = Ship::Context::CreateInstance("Spaghettify", "skart64", "spaghettify.cfg.json", OTRFiles, {}, 3, {32000, 1024, 2480});
+    this->context = Ship::Context::CreateInstance("Spaghettify", "skart64", "spaghettify.cfg.json", OTRFiles, {}, 3, {32000, 512, 1100});
 
     auto wnd = std::dynamic_pointer_cast<Fast::Fast3dWindow>(Ship::Context::GetInstance()->GetWindow());