diff --git a/src/win32/FullscreenSettings.cpp b/src/win32/FullscreenSettings.cpp
index 1f200e34..41d5d3b1 100644
--- a/src/win32/FullscreenSettings.cpp
+++ b/src/win32/FullscreenSettings.cpp
@@ -278,6 +278,7 @@ void FullscreenSettings::OnOK()
 {
 	if( failed ) return;
 
+#ifndef NO_D3D
 	int selection;
 
 	selection = combo_device.GetCurSel();
@@ -314,7 +315,7 @@ void FullscreenSettings::OnOK()
 	m_width = (unsigned int)mode.Width;
 	m_height = (unsigned int)mode.Height;
 	m_refreshRate = (unsigned int)mode.RefreshRate;
-
+#endif
 
 	CDialog::OnOK();
 }
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index bcc626bd..82e0570c 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -1407,14 +1407,16 @@ void VBA::loadSettings()
   }
 
   renderMethod = (DISPLAY_TYPE)regQueryDwordValue("renderMethod", DIRECT_3D);
-  if( ( renderMethod != DIRECT_3D ) && ( renderMethod != OPENGL ) ) {
-#ifndef NO_OGL
-	  renderMethod = OPENGL;
-#endif
-#ifndef NO_D3D
+#ifdef NO_OGL
+  if( renderMethod == OPENGL ) {
 	  renderMethod = DIRECT_3D;
-#endif
   }
+#endif
+#ifdef NO_D3D
+  if( renderMethod == DIRECT_3D ) {
+	  renderMethod = OPENGL;
+  }
+#endif
 
   audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND );
   if( ( audioAPI != DIRECTSOUND )