diff --git a/extras/AudioPluginHost/CMakeLists.txt b/extras/AudioPluginHost/CMakeLists.txt
index 15adc82133..d26e6c019a 100644
--- a/extras/AudioPluginHost/CMakeLists.txt
+++ b/extras/AudioPluginHost/CMakeLists.txt
@@ -30,6 +30,7 @@ target_sources(AudioPluginHost PRIVATE
     Source/UI/MainHostWindow.cpp)
 
 target_compile_definitions(AudioPluginHost PRIVATE
+    PIP_JUCE_EXAMPLES_DIRECTORY_STRING="${JUCE_SOURCE_DIR}/examples"
     JUCE_ALSA=1
     JUCE_DIRECTSOUND=1
     JUCE_PLUGINHOST_AU=1
@@ -41,7 +42,7 @@ target_compile_definitions(AudioPluginHost PRIVATE
     JUCE_USE_CDREADER=0
     JUCE_USE_CURL=0
     JUCE_USE_FLAC=0
-    JUCE_USE_OGGVORBIS=0
+    JUCE_USE_OGGVORBIS=1
     JUCE_WASAPI=1
     JUCE_WEB_BROWSER=0)
 
diff --git a/modules/juce_audio_basics/mpe/juce_MPESynthesiserBase.cpp b/modules/juce_audio_basics/mpe/juce_MPESynthesiserBase.cpp
index 98bf69e835..38e398d02a 100644
--- a/modules/juce_audio_basics/mpe/juce_MPESynthesiserBase.cpp
+++ b/modules/juce_audio_basics/mpe/juce_MPESynthesiserBase.cpp
@@ -110,13 +110,13 @@ void MPESynthesiserBase::renderNextBlock (AudioBuffer<floatType>& outputAudio,
     // you must set the sample rate before using this!
     jassert (sampleRate != 0);
 
-    const auto midiIterator = inputMidi.findNextSamplePosition (startSample);
+    auto midiIterator = inputMidi.findNextSamplePosition (startSample);
 
     bool firstEvent = true;
 
     const ScopedLock sl (noteStateLock);
 
-    while (numSamples > 0)
+    for (; numSamples > 0; ++midiIterator)
     {
         if (midiIterator == inputMidi.cend())
         {
diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp
index 719528f824..37e6dcd9f8 100644
--- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp
+++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp
@@ -169,7 +169,7 @@ void Synthesiser::processNextBlock (AudioBuffer<floatType>& outputAudio,
 
     const ScopedLock sl (lock);
 
-    while (numSamples > 0)
+    for (; numSamples > 0; ++midiIterator)
     {
         if (midiIterator == midiData.cend())
         {