diff --git a/examples/NetworkGraphicsDemo/Source/MasterComponent.h b/examples/NetworkGraphicsDemo/Source/MasterComponent.h
index 3ddbded323..e2ebd84e66 100644
--- a/examples/NetworkGraphicsDemo/Source/MasterComponent.h
+++ b/examples/NetworkGraphicsDemo/Source/MasterComponent.h
@@ -387,7 +387,7 @@ private:
 
     void newClientOSCMessageReceived (const OSCMessage& message)
     {
-        if (message.empty() || ! message[0].isString())
+        if (message.isEmpty() || ! message[0].isString())
             return;
 
         StringArray tokens = StringArray::fromTokens (message[0].getString(), ":", "");
diff --git a/examples/NetworkGraphicsDemo/Source/SlaveComponent.h b/examples/NetworkGraphicsDemo/Source/SlaveComponent.h
index 6c3a3676d4..bbc6d3ce3b 100644
--- a/examples/NetworkGraphicsDemo/Source/SlaveComponent.h
+++ b/examples/NetworkGraphicsDemo/Source/SlaveComponent.h
@@ -103,7 +103,7 @@ private:
 
     void canvasStateOSCMessageReceived (const OSCMessage& message)
     {
-        if (message.empty() || ! message[0].isBlob())
+        if (message.isEmpty() || ! message[0].isBlob())
             return;
 
         if (packetiser.appendIncomingBlock (message[0].getBlob()))
diff --git a/examples/OSCMonitor/Source/OSCLogListBox.h b/examples/OSCMonitor/Source/OSCLogListBox.h
index 9613c2041a..6580e5f9a4 100644
--- a/examples/OSCMonitor/Source/OSCLogListBox.h
+++ b/examples/OSCMonitor/Source/OSCLogListBox.h
@@ -78,7 +78,7 @@ public:
                         + String (message.size())
                         + " argument(s)");
 
-        if (! message.empty())
+        if (! message.isEmpty())
         {
             for (OSCArgument* arg = message.begin(); arg != message.end(); ++arg)
                 addOSCMessageArgument (*arg, level + 1);
diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp
index 9c88fc7c1a..fb45807575 100644
--- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp
+++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp
@@ -324,7 +324,7 @@ void MPEInstrument::noteOff (int midiChannel,
                              int midiNoteNumber,
                              MPEValue midiNoteOffVelocity)
 {
-    if (notes.empty() || ! isNoteChannel (midiChannel))
+    if (notes.isEmpty() || ! isNoteChannel (midiChannel))
         return;
 
     const ScopedLock sl (lock);
@@ -375,7 +375,7 @@ void MPEInstrument::updateDimension (int midiChannel, MPEDimension& dimension, M
 {
     dimension.lastValueReceivedOnChannel[midiChannel - 1] = value;
 
-    if (notes.empty())
+    if (notes.isEmpty())
         return;
 
     if (MPEZone* zone = zoneLayout.getZoneByMasterChannel (midiChannel))