diff --git a/wrap/glw/bookkeeping.h b/wrap/glw/bookkeeping.h
index 68238c66..04a87b38 100644
--- a/wrap/glw/bookkeeping.h
+++ b/wrap/glw/bookkeeping.h
@@ -176,7 +176,7 @@ class SharedObjectBinding
 
 		const ObjectType * object(void) const
 		{
-			GLW_ASSERT(!this->isNull())
+			GLW_ASSERT(!this->isNull());
 			const ObjectType * obj = this->m_shared->object();
 			obj->setBinding(this->m_target, this->m_unit);
 			return obj;
diff --git a/wrap/glw/buffer.h b/wrap/glw/buffer.h
index a39008d8..6d06bd14 100644
--- a/wrap/glw/buffer.h
+++ b/wrap/glw/buffer.h
@@ -144,8 +144,8 @@ class Buffer : public Object, public SafeBuffer
 
 		Buffer(Context * ctx)
 			: SafeObject  (ctx)
-			, SafeType    (ctx)
 			, BaseType    (ctx)
+			, SafeType    (ctx)
 			, m_mapAccess (GL_NONE)
 			, m_mapPtr    (0)
 		{
@@ -205,6 +205,6 @@ class Buffer : public Object, public SafeBuffer
 typedef detail::SafeHandle   <Buffer> BufferHandle;
 typedef detail::UnsafeHandle <Buffer> BoundBuffer;
 
-};
+} // end namespace glw
 
 #endif // GLW_BUFFER_H
diff --git a/wrap/glw/fragmentshader.h b/wrap/glw/fragmentshader.h
index 94ef3468..3a5b3f92 100644
--- a/wrap/glw/fragmentshader.h
+++ b/wrap/glw/fragmentshader.h
@@ -62,8 +62,8 @@ class FragmentShader : public Shader, public SafeFragmentShader
 		FragmentShader(Context * ctx)
 			: SafeObject (ctx)
 			, SafeShader (ctx)
-			, SafeType   (ctx)
 			, BaseType   (ctx)
+			, SafeType   (ctx)
 		{
 			;
 		}
@@ -82,6 +82,6 @@ class FragmentShader : public Shader, public SafeFragmentShader
 typedef detail::SafeHandle   <FragmentShader> FragmentShaderHandle;
 typedef detail::UnsafeHandle <FragmentShader> BoundFragmentShader;
 
-};
+}  // end namespace glw
 
 #endif // GLW_FRAGMENTSHADER_H
diff --git a/wrap/glw/framebuffer.h b/wrap/glw/framebuffer.h
index 4270eb7b..ac8b0fc6 100644
--- a/wrap/glw/framebuffer.h
+++ b/wrap/glw/framebuffer.h
@@ -189,8 +189,8 @@ class Framebuffer : public Object, public SafeFramebuffer
 
 		Framebuffer(Context * ctx)
 			: SafeObject  (ctx)
-			, SafeType    (ctx)
 			, BaseType    (ctx)
+			, SafeType    (ctx)
 		{
 			;
 		}
@@ -311,6 +311,6 @@ class Framebuffer : public Object, public SafeFramebuffer
 typedef detail::SafeHandle   <Framebuffer> FramebufferHandle;
 typedef detail::UnsafeHandle <Framebuffer> BoundFramebuffer;
 
-};
+}  // end namespace glw
 
 #endif // GLW_FRAMEBUFFER_H
diff --git a/wrap/glw/geometryshader.h b/wrap/glw/geometryshader.h
index 5a1d5d99..b0990aa4 100644
--- a/wrap/glw/geometryshader.h
+++ b/wrap/glw/geometryshader.h
@@ -62,8 +62,8 @@ class GeometryShader : public Shader, public SafeGeometryShader
 		GeometryShader(Context * ctx)
 			: SafeObject (ctx)
 			, SafeShader (ctx)
-			, SafeType   (ctx)
 			, BaseType   (ctx)
+			, SafeType   (ctx)
 		{
 			;
 		}
@@ -82,6 +82,6 @@ class GeometryShader : public Shader, public SafeGeometryShader
 typedef detail::SafeHandle   <GeometryShader> GeometryShaderHandle;
 typedef detail::UnsafeHandle <GeometryShader> BoundGeometryShader;
 
-};
+}  // end namespace glw
 
 #endif // GLW_GEOMETRYSHADER_H
diff --git a/wrap/glw/program.h b/wrap/glw/program.h
index 9f79e63d..a876c80c 100644
--- a/wrap/glw/program.h
+++ b/wrap/glw/program.h
@@ -297,8 +297,8 @@ class Program : public Object, public SafeProgram
 
 		Program(Context * ctx)
 			: SafeObject (ctx)
-			, SafeType   (ctx)
 			, BaseType   (ctx)
+			, SafeType   (ctx)
 		{
 			;
 		}
@@ -499,6 +499,6 @@ class Program : public Object, public SafeProgram
 typedef detail::SafeHandle   <Program> ProgramHandle;
 typedef detail::UnsafeHandle <Program> BoundProgram;
 
-};
+} // end namespace glw
 
 #endif // GLW_PROGRAM_H
diff --git a/wrap/glw/renderbuffer.h b/wrap/glw/renderbuffer.h
index 7f1e366f..03060740 100644
--- a/wrap/glw/renderbuffer.h
+++ b/wrap/glw/renderbuffer.h
@@ -92,8 +92,8 @@ class Renderbuffer : public Renderable, public SafeRenderbuffer
 		Renderbuffer(Context * ctx)
 			: SafeObject     (ctx)
 			, SafeRenderable (ctx)
-			, SafeType       (ctx)
 			, BaseType       (ctx)
+			, SafeType       (ctx)
 		{
 			;
 		}
@@ -153,6 +153,6 @@ class Renderbuffer : public Renderable, public SafeRenderbuffer
 typedef detail::SafeHandle   <Renderbuffer> RenderbufferHandle;
 typedef detail::UnsafeHandle <Renderbuffer> BoundRenderbuffer;
 
-};
+} // end namespace glw
 
 #endif // GLW_RENDERBUFFER_H
diff --git a/wrap/glw/shader.h b/wrap/glw/shader.h
index f03b85b1..3ced40d7 100644
--- a/wrap/glw/shader.h
+++ b/wrap/glw/shader.h
@@ -77,8 +77,8 @@ class Shader : public Object, public virtual SafeShader
 
 		Shader(Context * ctx)
 			: SafeObject (ctx)
-			, BaseType   (ctx)
 			, SafeType   (ctx)
+			, BaseType   (ctx)
 		{
 			;
 		}
@@ -169,6 +169,6 @@ class Shader : public Object, public virtual SafeShader
 typedef detail::SafeHandle   <Shader> ShaderHandle;
 typedef detail::UnsafeHandle <Shader> BoundShader;
 
-};
+} // end namespace glw
 
 #endif // GLW_SHADER_H
diff --git a/wrap/glw/texture2d.h b/wrap/glw/texture2d.h
index 9f371b5e..4d622755 100644
--- a/wrap/glw/texture2d.h
+++ b/wrap/glw/texture2d.h
@@ -129,8 +129,8 @@ class Texture2D : public Texture, public SafeTexture2D
 			: SafeObject     (ctx)
 			, SafeRenderable (ctx)
 			, SafeTexture    (ctx)
-			, SafeType       (ctx)
 			, BaseType       (ctx)
+			, SafeType       (ctx)
 		{
 			;
 		}
@@ -170,6 +170,6 @@ class Texture2D : public Texture, public SafeTexture2D
 typedef detail::SafeHandle   <Texture2D> Texture2DHandle;
 typedef detail::UnsafeHandle <Texture2D> BoundTexture2D;
 
-};
+} // end namespace glw
 
 #endif // GLW_TEXTURE2D_H
diff --git a/wrap/glw/utility.h b/wrap/glw/utility.h
index 0353e054..bce16844 100644
--- a/wrap/glw/utility.h
+++ b/wrap/glw/utility.h
@@ -213,15 +213,15 @@ inline Texture2DHandle createTexture2D(Context & ctx, GLenum format, GLsizei wid
 inline FramebufferHandle createFramebuffer
 (
 	Context & ctx,
-	RenderTarget & depthTarget ,
-	RenderTarget & colorTarget0 = RenderTarget(), 
-	RenderTarget & colorTarget1 = RenderTarget(), 
-	RenderTarget & colorTarget2 = RenderTarget(), 
-	RenderTarget & colorTarget3 = RenderTarget(), 
-	RenderTarget & colorTarget4 = RenderTarget(), 
-	RenderTarget & colorTarget5 = RenderTarget(), 
-	RenderTarget & colorTarget6 = RenderTarget(), 
-	RenderTarget & colorTarget7 = RenderTarget()
+	const RenderTarget & depthTarget ,
+	const RenderTarget & colorTarget0 = RenderTarget(),
+	const RenderTarget & colorTarget1 = RenderTarget(),
+	const RenderTarget & colorTarget2 = RenderTarget(),
+	const RenderTarget & colorTarget3 = RenderTarget(),
+	const RenderTarget & colorTarget4 = RenderTarget(),
+	const RenderTarget & colorTarget5 = RenderTarget(),
+	const RenderTarget & colorTarget6 = RenderTarget(),
+	const RenderTarget & colorTarget7 = RenderTarget()
 )
 {
 	FramebufferArguments args;
@@ -283,6 +283,6 @@ inline ProgramHandle loadProgram(Context & ctx, const std::string & srcPrefix, c
 	return loadProgram(ctx, srcPrefix, vertexFile, "", fragmentFile.c_str(), args);
 }
 
-};
+} // end namespace glw
 
 #endif // GLW_UTILITY_H
diff --git a/wrap/glw/vertexshader.h b/wrap/glw/vertexshader.h
index c6a1885d..2c723b36 100644
--- a/wrap/glw/vertexshader.h
+++ b/wrap/glw/vertexshader.h
@@ -62,8 +62,8 @@ class VertexShader : public Shader, public SafeVertexShader
 		VertexShader(Context * ctx)
 			: SafeObject (ctx)
 			, SafeShader (ctx)
-			, SafeType   (ctx)
 			, BaseType   (ctx)
+			, SafeType   (ctx)
 		{
 			;
 		}
@@ -82,6 +82,6 @@ class VertexShader : public Shader, public SafeVertexShader
 typedef detail::SafeHandle   <VertexShader> VertexShaderHandle;
 typedef detail::UnsafeHandle <VertexShader> BoundVertexShader;
 
-};
+} // end namespace glw
 
 #endif // GLW_VERTEXSHADER_H