diff --git a/gp2x/menu.c b/gp2x/menu.c
index d424152..47b91b1 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -799,7 +799,7 @@ static void cd_menu_loop_options(void)
 					} else {
 						if (PicoCDBuffers < 64) PicoCDBuffers = 64;
 						else PicoCDBuffers <<= 1;
-						if (PicoCDBuffers > 4096) PicoCDBuffers = 4096;
+						if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M
 					}
 					break;
 				case  7: currentConfig.PicoOpt^=0x1000; break;
diff --git a/linux/port_config.h b/linux/port_config.h
index a0a855a..42be264 100644
--- a/linux/port_config.h
+++ b/linux/port_config.h
@@ -4,6 +4,7 @@
 #define PORT_CONFIG_H
 
 #define CPU_CALL
+#define NO_IONBF
 
 // draw2.c
 #define START_ROW  0 // which row of tiles to start rendering at?
@@ -12,8 +13,8 @@
 // pico.c
 #define CAN_HANDLE_240_LINES	1
 
-//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
-#define dprintf(x...)
+#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
+//#define dprintf(x...)
 
 #endif //PORT_CONFIG_H