diff --git a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
index e3d8f4bc..aec5bceb 100644
--- a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
+++ b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
@@ -186,12 +186,14 @@ public interface ARB_shader_objects {
 			             @OutParameter
 	                     @Check(value = "1", canBeNull = true)
 	                     @GLsizei IntBuffer length,
+			             @OutParameter
 	                     @GLcharARB ByteBuffer infoLog);
 
 	void glGetAttachedObjectsARB(@GLhandleARB int containerObj, @AutoSize("obj") @GLsizei int maxCount,
 			                     @OutParameter
 	                             @Check(value = "1", canBeNull = true)
 	                             @GLsizei IntBuffer count,
+			                     @OutParameter
 	                             @GLhandleARB IntBuffer obj);
 
 	/**
@@ -209,6 +211,7 @@ public interface ARB_shader_objects {
 	                           @Check("1") IntBuffer size,
 	                           @Check("1")
 	                           @GLenum IntBuffer type,
+	                           @OutParameter
 	                           @GLcharARB ByteBuffer name);
 
 	@StripPostfix("params")
@@ -221,5 +224,6 @@ public interface ARB_shader_objects {
 			                  @OutParameter
 	                          @Check(value = "1", canBeNull = true)
 	                          @GLsizei IntBuffer length,
+			                  @OutParameter
 	                          @GLcharARB ByteBuffer source);
 }
diff --git a/src/templates/org/lwjgl/opengl/GL20.java b/src/templates/org/lwjgl/opengl/GL20.java
index 59af3bd5..0e3069ed 100644
--- a/src/templates/org/lwjgl/opengl/GL20.java
+++ b/src/templates/org/lwjgl/opengl/GL20.java
@@ -202,18 +202,21 @@ public interface GL20 {
 			                @OutParameter
 	                        @GLsizei
 	                        @Check(value = "1", canBeNull = true) IntBuffer length,
-	                        @GLchar ByteBuffer infoLog);
+			                @OutParameter
+			                @GLchar ByteBuffer infoLog);
 
 	void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength,
 			                 @OutParameter
 	                         @GLsizei
 	                         @Check(value = "1", canBeNull = true) IntBuffer length,
+			                 @OutParameter
 	                         @GLchar ByteBuffer infoLog);
 
 	void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount,
 			                  @OutParameter
 	                          @GLsizei
 	                          @Check(value = "1", canBeNull = true) IntBuffer count,
+			                  @OutParameter
 	                          @GLuint IntBuffer shaders);
 
 	/**
@@ -241,9 +244,10 @@ public interface GL20 {
 	@StripPostfix("params")
 	void glGetUniformiv(@GLuint int program, int location, @OutParameter @Check IntBuffer params);
 
-	void glGetShaderSource(@GLuint int shader, @OutParameter @AutoSize("source") @GLsizei int maxLength,
+	void glGetShaderSource(@GLuint int shader, @AutoSize("source") @GLsizei int maxLength,
 	                       @Check(value = "1", canBeNull = true)
 	                       @GLsizei IntBuffer length,
+	                       @OutParameter
 	                       @GLchar ByteBuffer source);
 
 	// ------------------------------------------------------------------
@@ -358,9 +362,8 @@ public interface GL20 {
 	                       @Check(value = "1", canBeNull = true)
 	                       @GLsizei IntBuffer length,
 	                       @Check("1") IntBuffer size,
-	                       @Check("1")
-	                       @GLenum IntBuffer type,
-	                       @Const
+	                       @Check("1") @GLenum IntBuffer type,
+	                       @OutParameter
 	                       @GLchar ByteBuffer name);
 
 	int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);