diff --git a/core/hw/pvr/Renderer_if.cpp b/core/hw/pvr/Renderer_if.cpp
index 0a9c5b16b..71c954e34 100644
--- a/core/hw/pvr/Renderer_if.cpp
+++ b/core/hw/pvr/Renderer_if.cpp
@@ -98,6 +98,7 @@ TA_context* _pvrrc;
 void SetREP(TA_context* cntx);
 void killtex();
 bool render_output_framebuffer();
+static void rend_create_renderer();
 
 void dump_frame(const char* file, TA_context* ctx, u8* vram, u8* vram_ref = NULL) {
 	FILE* fw = fopen(file, "wb");
@@ -266,6 +267,13 @@ bool rend_frame(TA_context* ctx, bool draw_osd) {
 
 bool rend_single_frame()
 {
+	if (renderer_changed)
+	{
+		renderer_changed = false;
+		rend_term_renderer();
+		rend_create_renderer();
+		rend_init_renderer();
+	}
 	//wait render start only if no frame pending
 	do
 	{
@@ -362,6 +370,7 @@ void rend_init_renderer()
     	}
     	printf("Selected renderer initialization failed. Falling back to default renderer.\n");
     	renderer  = fallback_renderer;
+    	fallback_renderer = NULL;	// avoid double-free
     }
 }
 
@@ -377,7 +386,6 @@ void rend_term_renderer()
 		delete fallback_renderer;
 		fallback_renderer = NULL;
 	}
-	tactx_Term();
 }
 
 void* rend_thread(void* p)
@@ -391,13 +399,6 @@ void* rend_thread(void* p)
 	{
 		if (rend_single_frame())
 			renderer->Present();
-		if (renderer_changed)
-		{
-			renderer_changed = false;
-			rend_term_renderer();
-			rend_create_renderer();
-			rend_init_renderer();
-		}
 	}
 
 	rend_term_renderer();
@@ -538,6 +539,7 @@ void rend_end_render()
 void rend_stop_renderer()
 {
 	renderer_enabled = false;
+	tactx_Term();
 }
 
 void rend_vblank()
diff --git a/core/linux-dist/x11.cpp b/core/linux-dist/x11.cpp
index aa71bdbdf..e053097be 100644
--- a/core/linux-dist/x11.cpp
+++ b/core/linux-dist/x11.cpp
@@ -361,6 +361,11 @@ void input_x11_init()
 		printf("X11 Keyboard input disabled by config.\n");
 }
 
+static int x11_error_handler(Display *, XErrorEvent *)
+{
+	return 0;
+}
+
 void x11_window_create()
 {
 	if (cfgLoadInt("pvr", "nox11", 0) == 0)
@@ -519,20 +524,22 @@ void x11_window_create()
 				GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
 				None
 			};
+			int (*old_handler)(Display *, XErrorEvent *) = XSetErrorHandler(&x11_error_handler);
 
 			x11_glc = glXCreateContextAttribsARB(x11Display, bestFbc, 0, True, context_attribs);
 			if (!x11_glc)
 			{
 				printf("Open GL 4.3 not supported\n");
-				// Try GL 3.1
+				// Try GL 3.0
 				context_attribs[1] = 3;
-				context_attribs[3] = 1;
+				context_attribs[3] = 0;
 				x11_glc = glXCreateContextAttribsARB(x11Display, bestFbc, 0, True, context_attribs);
 				if (!x11_glc)
 				{
-					die("Open GL 3.1 not supported\n");
+					die("Open GL 3.0 not supported\n");
 				}
 			}
+			XSetErrorHandler(old_handler);
 			XSync(x11Display, False);
 
 		#endif
diff --git a/core/rec-x86/rec_x86_driver.cpp b/core/rec-x86/rec_x86_driver.cpp
index 1d19a46fa..727cf4eee 100644
--- a/core/rec-x86/rec_x86_driver.cpp
+++ b/core/rec-x86/rec_x86_driver.cpp
@@ -326,8 +326,8 @@ void ngen_Compile(RuntimeBlockInfo* block, SmcCheckEnum smc_checks, bool reset,
 
 	if (prof.enable)
 	{
-		if (force_checks)
-		x86e->Emit(op_add32,&prof.counters.blkrun.force_check,1);
+		//if (force_checks)
+		//	x86e->Emit(op_add32,&prof.counters.blkrun.force_check,1);
 
 		x86e->Emit(op_add32,&prof.counters.blkrun.cycles[block->guest_cycles],1);
 	}
diff --git a/core/serialize.cpp b/core/serialize.cpp
index 47b6eb0ca..8b7e29900 100644
--- a/core/serialize.cpp
+++ b/core/serialize.cpp
@@ -1050,18 +1050,19 @@ bool dc_serialize(void **data, unsigned int *total_size)
 	REICAST_S(sch_list[modem_sched].tag) ;
     REICAST_S(sch_list[modem_sched].start) ;
     REICAST_S(sch_list[modem_sched].end) ;
+	#else
+	int modem_dummy = 0;
+	REICAST_S(modem_dummy);
+	REICAST_S(modem_dummy);
+	REICAST_S(modem_dummy);
 	#endif
 
 	REICAST_S(SCIF_SCFSR2);
 	REICAST_S(SCIF_SCFRDR2);
 	REICAST_S(SCIF_SCFDR2);
 
-
 	REICAST_S(BSC_PDTRA);
 
-
-
-
 	REICAST_SA(tmu_shift,3);
 	REICAST_SA(tmu_mask,3);
 	REICAST_SA(tmu_mask64,3);
@@ -1069,14 +1070,8 @@ bool dc_serialize(void **data, unsigned int *total_size)
 	REICAST_SA(tmu_ch_base,3);
 	REICAST_SA(tmu_ch_base64,3);
 
-
-
-
 	REICAST_SA(CCN_QACR_TR,2);
 
-
-
-
 	REICAST_SA(UTLB,64);
 	REICAST_SA(ITLB,4);
 #if defined(NO_MMU)
@@ -1086,8 +1081,6 @@ bool dc_serialize(void **data, unsigned int *total_size)
 	REICAST_S(mmu_error_TT);
 #endif
 
-
-
 	REICAST_S(NullDriveDiscType);
 	REICAST_SA(q_subchannel,96);
 
@@ -1129,22 +1122,16 @@ bool dc_serialize(void **data, unsigned int *total_size)
 	REICAST_S(div_som_reg2);
 	REICAST_S(div_som_reg3);
 
-
-
 	REICAST_S(LastAddr);
 	REICAST_S(LastAddr_min);
 	REICAST_SA(block_hash,1024);
 
-
 	REICAST_SA(RegisterWrite,sh4_reg_count);
 	REICAST_SA(RegisterRead,sh4_reg_count);
 	REICAST_S(fallback_blocks);
 	REICAST_S(total_blocks);
 	REICAST_S(REMOVED_OPS);
 
-
-
-
 	REICAST_SA(kcode,4);
 	REICAST_SA(rt,4);
 	REICAST_SA(lt,4);
@@ -1245,12 +1232,7 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	//this is one-time init, no updates - don't need to serialize
 	//extern _vmem_handler area0_handler;
 
-
-
-
-	REICAST_USA(reply_11,16) ;
-
-
+	REICAST_USA(reply_11,16);
 
 	REICAST_US(sns_asc);
 	REICAST_US(sns_ascq);
@@ -1364,8 +1346,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 
 	REICAST_USA(mem_b.data, mem_b.size);
 
-
-
 	REICAST_US(IRLPriority);
 	REICAST_USA(InterruptEnvId,32);
 	REICAST_USA(InterruptBit,32);
@@ -1374,9 +1354,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_US(interrupt_vmask);
 	REICAST_US(decoded_srimask);
 
-
-
-
 	REICAST_US(i) ;
 	if ( i == 0 )
 		do_sqw_nommu = &do_sqw_nommu_area_3 ;
@@ -1401,9 +1378,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_US(old_rm);
 	REICAST_US(old_dn);
 
-
-
-
 	REICAST_US(sh4_sched_ffb);
 	REICAST_US(sh4_sched_intr);
 
@@ -1452,18 +1426,19 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_US(sch_list[modem_sched].tag) ;
     REICAST_US(sch_list[modem_sched].start) ;
     REICAST_US(sch_list[modem_sched].end) ;
+	#else
+	int modem_dummy;
+	REICAST_US(modem_dummy);
+	REICAST_US(modem_dummy);
+	REICAST_US(modem_dummy);
 	#endif
 
 	REICAST_US(SCIF_SCFSR2);
 	REICAST_US(SCIF_SCFRDR2);
 	REICAST_US(SCIF_SCFDR2);
 
-
 	REICAST_US(BSC_PDTRA);
 
-
-
-
 	REICAST_USA(tmu_shift,3);
 	REICAST_USA(tmu_mask,3);
 	REICAST_USA(tmu_mask64,3);
@@ -1471,14 +1446,8 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_USA(tmu_ch_base,3);
 	REICAST_USA(tmu_ch_base64,3);
 
-
-
-
 	REICAST_USA(CCN_QACR_TR,2);
 
-
-
-
 	REICAST_USA(UTLB,64);
 	REICAST_USA(ITLB,4);
 #if defined(NO_MMU)
@@ -1488,9 +1457,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_US(mmu_error_TT);
 #endif
 
-
-
-
 	REICAST_US(NullDriveDiscType);
 	REICAST_USA(q_subchannel,96);
 
@@ -1545,9 +1511,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_US(div_som_reg2);
 	REICAST_US(div_som_reg3);
 
-
-
-
 	//REICAST_USA(CodeCache,CODE_SIZE) ;
 	//REICAST_USA(SH4_TCB,CODE_SIZE+4096);
 	REICAST_US(LastAddr);
@@ -1611,7 +1574,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 		REICAST_US(timers[i].m_step);
 	}
 
-
 	REICAST_USA(aica_ram.data,aica_ram.size) ;
 	REICAST_US(VREG);
 	REICAST_US(ARMRST);
@@ -1619,8 +1581,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 
 	REICAST_USA(aica_reg,0x8000);
 
-
-
 	REICAST_USA(volume_lut,16);
 	REICAST_USA(tl_lut,256 + 768);
 	REICAST_USA(AEG_ATT_SPS,64);
@@ -1635,14 +1595,11 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 	REICAST_USA(mxlr,64);
 	REICAST_US(samples_gen);
 
-
 	register_unserialize(sb_regs, data, total_size) ;
 	REICAST_US(SB_ISTNRM);
 	REICAST_US(SB_FFST_rc);
 	REICAST_US(SB_FFST);
 
-
-
 	//this is one-time init, no updates - don't need to serialize
 	//extern RomChip sys_rom;
 	REICAST_US(sys_nvmem.size);
@@ -1754,8 +1711,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 
 	REICAST_USA(mem_b.data, mem_b.size);
 
-
-
 	REICAST_US(IRLPriority);
 	REICAST_USA(InterruptEnvId,32);
 	REICAST_USA(InterruptBit,32);
@@ -1764,9 +1719,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 	REICAST_US(interrupt_vmask);
 	REICAST_US(decoded_srimask);
 
-
-
-
 	REICAST_US(i) ;
 	if ( i == 0 )
 		do_sqw_nommu = &do_sqw_nommu_area_3 ;
@@ -1842,6 +1794,11 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 	REICAST_US(sch_list[modem_sched].tag) ;
     REICAST_US(sch_list[modem_sched].start) ;
     REICAST_US(sch_list[modem_sched].end) ;
+	#else
+	int modem_dummy;
+	REICAST_US(modem_dummy);
+	REICAST_US(modem_dummy);
+	REICAST_US(modem_dummy);
 	#endif
 
 	REICAST_US(SCIF_SCFSR2);
@@ -1879,8 +1836,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 #endif
 
 
-
-
 	REICAST_US(NullDriveDiscType);
 	REICAST_USA(q_subchannel,96);
 
@@ -1896,7 +1851,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 //	REICAST_US(i);	// VRAM_MASK
 
 
-
 	REICAST_US(naomi_updates);
 	REICAST_US(i); // BoardID
 	REICAST_US(GSerialBuffer);
@@ -1935,25 +1889,18 @@ bool dc_unserialize(void **data, unsigned int *total_size)
 	REICAST_US(div_som_reg2);
 	REICAST_US(div_som_reg3);
 
-
-
-
 	//REICAST_USA(CodeCache,CODE_SIZE) ;
 	//REICAST_USA(SH4_TCB,CODE_SIZE+4096);
 	REICAST_US(LastAddr);
 	REICAST_US(LastAddr_min);
 	REICAST_USA(block_hash,1024);
 
-
 	REICAST_USA(RegisterWrite,sh4_reg_count);
 	REICAST_USA(RegisterRead,sh4_reg_count);
 	REICAST_US(fallback_blocks);
 	REICAST_US(total_blocks);
 	REICAST_US(REMOVED_OPS);
 
-
-
-
 	REICAST_USA(kcode,4);
 	REICAST_USA(rt,4);
 	REICAST_USA(lt,4);
diff --git a/shell/android-studio/reicast/src/main/jni/Android.mk b/shell/android-studio/reicast/src/main/jni/Android.mk
index 9bb894c11..0eb55d90a 100644
--- a/shell/android-studio/reicast/src/main/jni/Android.mk
+++ b/shell/android-studio/reicast/src/main/jni/Android.mk
@@ -22,6 +22,7 @@ WEBUI := 1
 USE_GLES := 1
 CHD5_LZMA := 1
 CHD5_FLAC := 1
+USE_MODEM := 1
 
 ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
   NOT_ARM := 1
diff --git a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
index a12ad753f..cff1dafd5 100644
--- a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
+++ b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
@@ -2546,6 +2546,7 @@
 					TARGET_NO_AREC,
 					XBYAK_NO_OP_NAMES,
 					TARGET_NO_OPENMP,
+					ENABLE_MODEM,
 					CHD5_LZMA,
 					_7ZIP_ST,
 					CHD5_FLAC,
@@ -2602,6 +2603,7 @@
 					TARGET_NO_AREC,
 					XBYAK_NO_OP_NAMES,
 					TARGET_NO_OPENMP,
+					ENABLE_MODEM,
 					CHD5_LZMA,
 					_7ZIP_ST,
 					CHD5_FLAC,