diff --git a/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp b/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
index 6d39c40d07..869f77e9ac 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
@@ -79,21 +79,25 @@ void OpenGLHelpers::enableScissorTest (const Rectangle<int>& clip)
 
 String OpenGLHelpers::translateVertexShaderToV3 (const String& code)
 {
+   #if JUCE_OPENGL3
     if (OpenGLShaderProgram::getLanguageVersion() > 1.2)
         return "#version 150\n" + code.replace ("attribute", "in")
                                       .replace ("varying", "out");
+   #endif
 
     return code;
 }
 
 String OpenGLHelpers::translateFragmentShaderToV3 (const String& code)
 {
+   #if JUCE_OPENGL3
     if (OpenGLShaderProgram::getLanguageVersion() > 1.2)
         return "#version 150\n"
                "out vec4 fragColor;\n"
                 + code.replace ("varying", "in")
                       .replace ("texture2D", "texture")
                       .replace ("gl_FragColor", "fragColor");
+   #endif
 
     return code;
 }
diff --git a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp
index a1a0681ef9..c4dd134f33 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp
@@ -65,9 +65,8 @@ double OpenGLShaderProgram::getLanguageVersion()
    #endif
 }
 
-bool OpenGLShaderProgram::addShader (const String& codeString, GLenum type)
+bool OpenGLShaderProgram::addShader (const String& code, GLenum type)
 {
-    String code (codeString);
     GLuint shaderID = context.extensions.glCreateShader (type);
 
     const GLchar* c = code.toRawUTF8();