diff --git a/src/custom.cpp b/src/custom.cpp
index 045c55d4..32566e94 100644
--- a/src/custom.cpp
+++ b/src/custom.cpp
@@ -7659,8 +7659,10 @@ static void fpscounter (bool frameok)
 	if (bogusframe || int(last) < 0)
 		return;
 
+#ifdef AMIBERRY // frameskip
 	if (currprefs.gfx_framerate == 2)
 		idletime >>= 1;
+#endif
 	
 	mavg (&fps_mavg, last / 10, FPSCOUNTER_MAVG_SIZE);
 	mavg (&idle_mavg, idletime / 10, FPSCOUNTER_MAVG_SIZE);
diff --git a/src/osdep/gui/PanelDisplay.cpp b/src/osdep/gui/PanelDisplay.cpp
index 1ccaee34..edd19eab 100644
--- a/src/osdep/gui/PanelDisplay.cpp
+++ b/src/osdep/gui/PanelDisplay.cpp
@@ -424,6 +424,11 @@ void RefreshPanelDisplay()
 		cboScreenmode->setSelected(1);
 	else if (changed_prefs.gfx_apmode[0].gfx_fullscreen == GFX_FULLWINDOW)
 		cboScreenmode->setSelected(2);
+
+#ifdef USE_DISPMANX
+	lblScreenmode->setEnabled(false);
+	cboScreenmode->setEnabled(false);
+#endif
 	
 	if (changed_prefs.scaling_method == -1)
 		optAuto->setSelected(true);
@@ -432,6 +437,13 @@ void RefreshPanelDisplay()
 	else if (changed_prefs.scaling_method == 1)
 		optLinear->setSelected(true);
 
+#ifdef USE_DISPMANX
+	grpScalingMethod->setEnabled(false);
+	optAuto->setEnabled(false);
+	optNearest->setEnabled(false);
+	optLinear->setEnabled(false);
+#endif
+	
 	if (changed_prefs.gfx_vresolution == VRES_NONDOUBLE && changed_prefs.gfx_pscanlines == 0)
 		optSingle->setSelected(true);
 	else if (changed_prefs.gfx_vresolution == VRES_DOUBLE && changed_prefs.gfx_pscanlines == 0)