diff --git a/Source/Bind/Main.cs b/Source/Bind/Main.cs
index c26c5438..f7d17f77 100644
--- a/Source/Bind/Main.cs
+++ b/Source/Bind/Main.cs
@@ -126,11 +126,11 @@ namespace Bind
                         break;
 
                     case GeneratorMode.Glu:
-                        Generator = new Bind.Glu.Generator();
+                        
                         break;
 
                     case GeneratorMode.Glx:
-                        Generator = new Bind.Glx.Generator();
+                        
                         break;
 
                     case GeneratorMode.GL3:
diff --git a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs
index aa0fa591..f2e28135 100644
--- a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs
+++ b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs
@@ -107,7 +107,7 @@ namespace Examples.Tutorial
                 0.0, 1.0, 0.0
             );
 
-            GL.Rotatef(angle, 0.0f, 1.0f, 0.0f);
+            GL.Rotate(angle, 0.0f, 1.0f, 0.0f);
             angle += 0.5f;
         }
 
diff --git a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs
index d32434b7..f959efd6 100644
--- a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs
+++ b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs
@@ -150,8 +150,8 @@ namespace Examples.Tutorial
             foreach (DisplayList d in lists)
             {
                 GL.LoadIdentity();
-                GL.Rotated(angle, 0.0, 0.0, 1.0);
-                GL.Translated(5.0, 0.0, 0.0);
+                GL.Rotate(angle, 0.0, 0.0, 1.0);
+                GL.Translate(5.0, 0.0, 0.0);
 
                 d.Render();
                 angle += 360 / lists.Count;
diff --git a/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs b/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs
index 83b11249..c719c2f3 100644
--- a/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs
+++ b/Source/Examples/WinForms/W02_Immediate_Mode_Cube.cs
@@ -96,7 +96,7 @@ namespace Examples.WinForms
                 0.0, 0.0, 0.0,
                 0.0, 1.0, 0.0
             );
-            GL.Rotatef(angle, 0.0f, 1.0f, 0.0f);
+            GL.Rotate(angle, 0.0f, 1.0f, 0.0f);
             angle += 0.5f;
 
             GL.Clear(GL.Enums.ClearBufferMask.COLOR_BUFFER_BIT | GL.Enums.ClearBufferMask.DEPTH_BUFFER_BIT);
diff --git a/Source/OpenTK/Platform/X11/Glx.cs b/Source/OpenTK/Platform/X11/Glx.cs
index d34f2f08..5c7a16d3 100644
--- a/Source/OpenTK/Platform/X11/Glx.cs
+++ b/Source/OpenTK/Platform/X11/Glx.cs
@@ -267,7 +267,7 @@ namespace OpenTK.Platform.X11
         [DllImport(Library, EntryPoint = "glXCreateContext")]
         public static extern IntPtr CreateContext(IntPtr dpy, IntPtr vis, IntPtr shareList, bool direct);
 
-        public static IntPtr CreateContext(IntPtr dpy, VisualInfo vis, IntPtr shareList, bool direct)
+        public static IntPtr CreateContext(IntPtr dpy, XVisualInfo vis, IntPtr shareList, bool direct)
         {
             GCHandle h0 = GCHandle.Alloc(vis, GCHandleType.Pinned);
 
diff --git a/Source/OpenTK/Platform/X11/WindowInfo.cs b/Source/OpenTK/Platform/X11/WindowInfo.cs
index 0195461a..b3b7ac73 100644
--- a/Source/OpenTK/Platform/X11/WindowInfo.cs
+++ b/Source/OpenTK/Platform/X11/WindowInfo.cs
@@ -41,7 +41,7 @@ namespace OpenTK.Platform.X11
         public IntPtr TopLevelWindow { get { return topLevelWindow; } set { topLevelWindow = value; } }
         public IntPtr Display { get { return display; } set { display = value; } }
         public int Screen { get { return screen; } set { screen = value; } }
-        public VisualInfo VisualInfo { get { return visinfo; } set { visinfo = value; } }
+        public XVisualInfo VisualInfo { get { return visinfo; } set { visinfo = value; } }
 
         public IntPtr Handle { get { return handle; } set { handle = value; } }
         public IWindowInfo Parent { get { return parent; } set { parent = value as WindowInfo; } }