diff --git a/btgui/OpenGLWindow/GlewWindows/GL/glew.h b/btgui/OpenGLWindow/GlewWindows/GL/glew.h
index 3962f7c91..58c89d665 100644
--- a/btgui/OpenGLWindow/GlewWindows/GL/glew.h
+++ b/btgui/OpenGLWindow/GlewWindows/GL/glew.h
@@ -1171,6 +1171,7 @@ GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei heigh
 #endif /* GL_VERSION_1_1 */
 
 /* ---------------------------------- GLU ---------------------------------- */
+#define GLEW_NO_GLU
 
 #ifndef GLEW_NO_GLU
 /* this is where we can safely include GLU */
diff --git a/btgui/OpenGLWindow/OpenGLInclude.h b/btgui/OpenGLWindow/OpenGLInclude.h
index 3af48049e..5a28716ca 100644
--- a/btgui/OpenGLWindow/OpenGLInclude.h
+++ b/btgui/OpenGLWindow/OpenGLInclude.h
@@ -35,7 +35,7 @@ subject to the following restrictions:
 #include <GL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
+//#include <GL/glu.h>
 #endif //_WINDOWS
 #endif //APPLE
 
diff --git a/btgui/OpenGLWindow/X11OpenGLWindow.cpp b/btgui/OpenGLWindow/X11OpenGLWindow.cpp
index dac32cfd2..2975ca341 100644
--- a/btgui/OpenGLWindow/X11OpenGLWindow.cpp
+++ b/btgui/OpenGLWindow/X11OpenGLWindow.cpp
@@ -1,11 +1,13 @@
 #include "X11OpenGLWindow.h"
+#include "OpenGLInclude.h"
+
 #include<stdio.h>
 #include<stdlib.h>
 #include<X11/X.h>
 #include<X11/Xlib.h>
 #include<GL/gl.h>
 #include<GL/glx.h>
-#include<GL/glu.h>
+//#include<GL/glu.h>
 
 
 GLint                   att[] = { GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None };
@@ -413,3 +415,9 @@ void X11OpenGLWindow::setKeyboardCallback( b3KeyboardCallback	keyboardCallback)
 	m_data->m_keyboardCallback = keyboardCallback;
 
 }
+
+b3KeyboardCallback      X11OpenGLWindow::getKeyboardCallback()
+{
+	return m_data->m_keyboardCallback;
+}
+
diff --git a/btgui/OpenGLWindow/X11OpenGLWindow.h b/btgui/OpenGLWindow/X11OpenGLWindow.h
index 5e6caac77..7bfa219ff 100644
--- a/btgui/OpenGLWindow/X11OpenGLWindow.h
+++ b/btgui/OpenGLWindow/X11OpenGLWindow.h
@@ -52,6 +52,7 @@ public:
         virtual void setResizeCallback(b3ResizeCallback resizeCallback);
         virtual void setWheelCallback(b3WheelCallback wheelCallback);
         virtual void setKeyboardCallback( b3KeyboardCallback    keyboardCallback);
+        virtual b3KeyboardCallback      getKeyboardCallback();
 
         virtual void setRenderCallback( b3RenderCallback renderCallback);
 
diff --git a/build/findOpenGLGlewGlut.lua b/build/findOpenGLGlewGlut.lua
index dd72ae923..9afe778b6 100644
--- a/build/findOpenGLGlewGlut.lua
+++ b/build/findOpenGLGlewGlut.lua
@@ -42,7 +42,13 @@
 			files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
 		end
 		if os.is("Linux") then
-			links{"GLEW"}
+			--links{"GLEW"}
+			defines { "GLEW_STATIC"}
+                        includedirs {
+                                        projectRootDir .. "btgui/OpenGLWindow/GlewWindows"
+                        }
+                        files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
+
 		end
 		configuration{}
 	end
diff --git a/src/Bullet3Common/b3QuadWord.h b/src/Bullet3Common/b3QuadWord.h
index f135db676..8a36af8cf 100644
--- a/src/Bullet3Common/b3QuadWord.h
+++ b/src/Bullet3Common/b3QuadWord.h
@@ -68,7 +68,11 @@ public:
 		mVec128 = v128;
 	}
 #else
-	b3Scalar	m_floats[4];
+	union
+	{
+		b3Scalar	m_floats[4];
+		struct {b3Scalar x,y,z,w;};
+	};
 #endif // B3_USE_SSE
 
 #endif //__CELLOS_LV2__ __SPU__
diff --git a/src/Bullet3Common/b3Vector3.h b/src/Bullet3Common/b3Vector3.h
index df0d96013..be9efd3de 100644
--- a/src/Bullet3Common/b3Vector3.h
+++ b/src/Bullet3Common/b3Vector3.h
@@ -106,7 +106,11 @@ public:
             mVec128 = v128;
         }
     #else
-        b3Scalar	m_floats[4];
+	union
+	{
+        	b3Scalar	m_floats[4];
+		struct {b3Scalar x,y,z,w;};
+	};
     #endif
 #endif //__CELLOS_LV2__ __SPU__