diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h
index d4f9a33b0a..1bbfed47eb 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h	
@@ -551,7 +551,7 @@ protected:
             XmlElement* compiler = createToolElement (xml, "VCCLCompilerTool");
 
             const int optimiseLevel = (int) config.getOptimisationLevel().getValue();
-            compiler->setAttribute ("Optimization", optimiseLevel <= 1 ? "0" : (optimiseLevel == 2 ? "2" : "3"));
+            compiler->setAttribute ("Optimization", optimiseLevel <= 1 ? "0" : (optimiseLevel == 2 ? "1" : "2"));
 
             if (isDebug)
             {
diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp
index c17ebcf07f..dae95198c5 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Module.cpp
@@ -382,6 +382,14 @@ RelativePath LibraryModule::getModuleRelativeToProject (ProjectExporter& exporte
     return p.getChildFile (getID());
 }
 
+RelativePath LibraryModule::getModuleOrLocalCopyRelativeToProject (ProjectExporter& exporter, const File& localModuleFolder) const
+{
+    if (exporter.getProject().shouldCopyModuleFilesLocally (getID()).getValue())
+        return RelativePath (exporter.getProject().getRelativePathForFile (localModuleFolder), RelativePath::projectFolder);
+
+    return getModuleRelativeToProject (exporter);
+}
+
 //==============================================================================
 void LibraryModule::writeIncludes (ProjectSaver& projectSaver, OutputStream& out)
 {
@@ -650,7 +658,7 @@ void LibraryModule::addBrowsableCode (ProjectExporter& exporter, const Array<Fil
 
     Project::Item sourceGroup (Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID()));
 
-    const RelativePath moduleFromProject (getModuleRelativeToProject (exporter));
+    const RelativePath moduleFromProject (getModuleOrLocalCopyRelativeToProject (exporter, localModuleFolder));
 
     for (int i = 0; i < sourceFiles.size(); ++i)
     {
diff --git a/extras/Introjucer/Source/Project/jucer_Module.h b/extras/Introjucer/Source/Project/jucer_Module.h
index 01fa13ac9f..73d61f85ac 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.h
+++ b/extras/Introjucer/Source/Project/jucer_Module.h
@@ -76,6 +76,7 @@ private:
     void addBrowsableCode (ProjectExporter& exporter, const Array<File>& compiled, const File& localModuleFolder) const;
     void createLocalHeaderWrapper (ProjectSaver& projectSaver, const File& originalHeader, const File& localHeader) const;
     RelativePath getModuleRelativeToProject (ProjectExporter& exporter) const;
+    RelativePath getModuleOrLocalCopyRelativeToProject (ProjectExporter& exporter, const File& localModuleFolder) const;
 
     bool isPluginClient() const;
     bool isAUPluginHost (const Project& project) const;
diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
index d6c690d8d2..8d3be9a5c1 100644
--- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
@@ -390,7 +390,7 @@ public:
                         break;
                     }
 
-                    input->setPosition (chunkEnd);
+                    input->setPosition (chunkEnd + (chunkEnd & 1)); // (chunks should be aligned to an even byte address)
                 }
             }
         }
diff --git a/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp b/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
index 19197630f4..d4202fa093 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
@@ -35,7 +35,7 @@ void OpenGLHelpers::clear (const Colour& colour)
     glClearColor (colour.getFloatRed(), colour.getFloatGreen(),
                   colour.getFloatBlue(), colour.getFloatAlpha());
 
-    glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 }
 
 void OpenGLHelpers::setColour (const Colour& colour)