diff --git a/Source/Examples/Main.cs b/Source/Examples/Main.cs
index b9224cfd..5da07c59 100644
--- a/Source/Examples/Main.cs
+++ b/Source/Examples/Main.cs
@@ -85,8 +85,6 @@ namespace Examples
         public static void Main(string[] args)
         {
             Trace.Listeners.Add(new ConsoleTraceListener());
-            LaunchExample(typeof(Examples.Tests.GameWindowStates).FullName);
-            return;
 
             if (args.Length > 0)
             {
diff --git a/Source/Examples/OpenGLES/2.0/SimpleWindow20.cs b/Source/Examples/OpenGLES/2.0/SimpleWindow20.cs
index b810b24f..ac01e84a 100644
--- a/Source/Examples/OpenGLES/2.0/SimpleWindow20.cs
+++ b/Source/Examples/OpenGLES/2.0/SimpleWindow20.cs
@@ -24,7 +24,7 @@ namespace Examples.Tutorial
         #region Constructor
 
         public SimpleES20Window(GraphicsContextFlags flags)
-            : base(800, 600, new GraphicsMode(16, 16), "", GameWindowFlags.Default, DisplayDevice.Default, 2, 0, flags)
+            : base(800, 600, GraphicsMode.Default, "", GameWindowFlags.Default, DisplayDevice.Default, 2, 0, flags)
         { }
 
         #endregion
@@ -111,9 +111,7 @@ namespace Examples.Tutorial
             SimpleES20Window example;
             try
             {
-                example = new SimpleES20Window(GraphicsContextFlags.Default);
-
-                //example = new SimpleES20Window(GraphicsContextFlags.Embedded);
+                example = new SimpleES20Window(GraphicsContextFlags.Embedded);
             }
             catch
             {
diff --git a/Source/Examples/OpenTK/Test/GameWindowStates.cs b/Source/Examples/OpenTK/Test/GameWindowStates.cs
index eda29cce..6977de2a 100644
--- a/Source/Examples/OpenTK/Test/GameWindowStates.cs
+++ b/Source/Examples/OpenTK/Test/GameWindowStates.cs
@@ -29,8 +29,7 @@ namespace Examples.Tests
         KeyboardState keyboard, keyboard_old;
 
         public GameWindowStates()
-            : base(800, 600, GraphicsMode.Default, "Test", GameWindowFlags.Default,
-            DisplayDevice.GetDisplay(DisplayIndex.Second), 1, 0, GraphicsContextFlags.Embedded)
+            : base(800, 600, GraphicsMode.Default)
         {
             VSync = VSyncMode.On;
             Keyboard.KeyRepeat = true;
diff --git a/Source/OpenTK/Platform/Egl/EglGraphicsMode.cs b/Source/OpenTK/Platform/Egl/EglGraphicsMode.cs
index b6f0a35e..07f847e9 100644
--- a/Source/OpenTK/Platform/Egl/EglGraphicsMode.cs
+++ b/Source/OpenTK/Platform/Egl/EglGraphicsMode.cs
@@ -67,7 +67,7 @@ namespace OpenTK.Platform.Egl
                 Egl.DEPTH_SIZE, depth > 0 ? depth : 0,
                 Egl.STENCIL_SIZE, stencil > 0 ? stencil : 0,
 
-                //Egl.SAMPLE_BUFFERS, samples > 0 ? 1 : 0,
+                Egl.SAMPLE_BUFFERS, samples > 0 ? 1 : 0,
                 Egl.SAMPLES, samples > 0 ? samples : 0,
 
                 Egl.NONE,