diff --git a/misc/saturn/Makefile b/misc/saturn/Makefile
index 3bf455cd2..3fc2acc31 100644
--- a/misc/saturn/Makefile
+++ b/misc/saturn/Makefile
@@ -20,7 +20,8 @@ IP_RELEASE_DATE:= 20230101
 IP_AREAS:= JTUBKAEL
 IP_PERIPHERALS:= JAMKST
 IP_TITLE:= ClassiCube
-IP_MASTER_STACK_ADDR:= 0x06004000
+#IP_MASTER_STACK_ADDR:= 0x06004000
+IP_MASTER_STACK_ADDR:= 0x06100000
 IP_SLAVE_STACK_ADDR:= 0x06001E00
 IP_1ST_READ_ADDR:= 0x06004000
 IP_1ST_READ_SIZE:= 0
diff --git a/src/Bitmap.c b/src/Bitmap.c
index 998464662..360983317 100644
--- a/src/Bitmap.c
+++ b/src/Bitmap.c
@@ -358,11 +358,7 @@ cc_result Png_Decode(struct Bitmap* bmp, struct Stream* stream) {
 	int curY;
 
 	/* idat decompressor */
-#ifdef CC_BUILD_TINYSTACK
-	static struct InflateState inflate;
-#else
 	struct InflateState inflate;
-#endif
 	struct Stream compStream, datStream;
 	struct ZLibHeader zlibHeader;
 	cc_uint8* data = NULL;
diff --git a/src/Builder.c b/src/Builder.c
index 0206192d7..e52cce23a 100644
--- a/src/Builder.c
+++ b/src/Builder.c
@@ -364,11 +364,15 @@ void Builder_MakeChunk(struct ChunkInfo* info) {
 	/* The Saturn build only has 16 kb stack, not large enough */
 	static BlockID chunk[EXTCHUNK_SIZE_3]; 
 	static cc_uint8 counts[CHUNK_SIZE_3 * FACE_COUNT]; 
-	static int bitFlags[1];
 #else
 	BlockID chunk[EXTCHUNK_SIZE_3]; 
 	cc_uint8 counts[CHUNK_SIZE_3 * FACE_COUNT]; 
+#endif
+
+#ifdef CC_BUILD_ADVLIGHTING
 	int bitFlags[EXTCHUNK_SIZE_3];
+#else
+	int bitFlags[1];
 #endif
 
 	cc_bool allAir, allSolid, onBorder;
diff --git a/src/Core.h b/src/Core.h
index a29481264..c84546fcb 100644
--- a/src/Core.h
+++ b/src/Core.h
@@ -490,7 +490,6 @@ typedef cc_uint8  cc_bool;
 	#define CC_BUILD_NOMUSIC
 	#define CC_BUILD_NOSOUNDS
 	#define CC_BUILD_SMALLSTACK
-	#define CC_BUILD_TINYSTACK
 	#define CC_BUILD_NOFPU
 	#undef  CC_BUILD_RESOURCES
 	#undef  CC_BUILD_NETWORKING
@@ -507,7 +506,6 @@ typedef cc_uint8  cc_bool;
 	#define CC_BUILD_NOMUSIC
 	#define CC_BUILD_NOSOUNDS
 	#define CC_BUILD_SMALLSTACK
-	#define CC_BUILD_TINYSTACK
 	#define CC_BUILD_NOFPU
 	#undef  CC_BUILD_RESOURCES
 	#undef  CC_BUILD_NETWORKING