diff --git a/src/opengl/extensions.c b/src/opengl/extensions.c
index 91857b615..3764d1331 100644
--- a/src/opengl/extensions.c
+++ b/src/opengl/extensions.c
@@ -724,15 +724,6 @@ void _al_ogl_manage_extensions(ALLEGRO_DISPLAY *gl_disp)
    ALLEGRO_OGL_EXT_API *ext_api;
    ALLEGRO_OGL_EXT_LIST *ext_list;
 
-   /* Print out OpenGL extensions
-    * We should use glGetStringi(GL_EXTENSIONS, i) for OpenGL 3.0+
-    * but it doesn't seem to work until later.
-    */
-   if (!_al_ogl_version_3_only(gl_disp->flags)) {
-      ALLEGRO_DEBUG("OpenGL Extensions:\n");
-      print_extensions((char const *)glGetString(GL_EXTENSIONS));
-   }
-
    /* Print out GLU version */
    //buf = gluGetString(GLU_VERSION);
    //ALLEGRO_INFO("GLU Version : %s\n", buf);
@@ -798,10 +789,9 @@ void _al_ogl_manage_extensions(ALLEGRO_DISPLAY *gl_disp)
    /* Need that symbol already so can't wait until it is assigned later. */
    glGetStringi = ext_api->GetStringi;
 
-   if (_al_ogl_version_3_only(gl_disp->flags)) {
-      ALLEGRO_DEBUG("OpenGL Extensions:\n");
-      print_extensions_3_0();
-   }
+   ALLEGRO_DEBUG("OpenGL Extensions:\n");
+   print_extensions_3_0();
+
 #endif
 
    /* Create the list of supported extensions. */
diff --git a/src/win/wgl_disp.c b/src/win/wgl_disp.c
index e7952a553..3ae5af4d4 100644
--- a/src/win/wgl_disp.c
+++ b/src/win/wgl_disp.c
@@ -959,10 +959,8 @@ static bool create_display_internals(ALLEGRO_DISPLAY_WGL *wgl_disp)
       return false;
    }
 
-   major = _al_get_suggested_display_option(disp,
-      ALLEGRO_OPENGL_MAJOR_VERSION, 0);
-   minor = _al_get_suggested_display_option(disp,
-      ALLEGRO_OPENGL_MINOR_VERSION, 0);
+   major = al_get_new_display_option(ALLEGRO_OPENGL_MAJOR_VERSION , 0);
+   minor = al_get_new_display_option(ALLEGRO_OPENGL_MINOR_VERSION , 0);
 
    if ((disp->flags & ALLEGRO_OPENGL_3_0) || major != 0) {
       if (major == 0)