diff --git a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
index 618fe51f5b..a4588f9a10 100644
--- a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
@@ -436,10 +436,7 @@ struct VBRTagData
         vbrScale = -1;
 
         if (flags & 8)
-        {
             vbrScale = ByteOrder::bigEndianInt (data);
-            data += 4;
-        }
 
         headersize = ((type + 1) * 72000 * bitrate) / sampleRate;
         return true;
diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h
index b236468875..f57dfb9a23 100644
--- a/modules/juce_core/containers/juce_OwnedArray.h
+++ b/modules/juce_core/containers/juce_OwnedArray.h
@@ -249,12 +249,13 @@ public:
         @param newObject       the new object to add to the array
         @see set, insert, addIfNotAlreadyThere, addSorted
     */
-    void add (const ObjectClass* const newObject) noexcept
+    ObjectClass* add (ObjectClass* const newObject) noexcept
     {
         const ScopedLockType lock (getLock());
         data.ensureAllocatedSize (numUsed + 1);
         jassert (data.elements != nullptr);
         data.elements [numUsed++] = const_cast <ObjectClass*> (newObject);
+        return const_cast <ObjectClass*> (newObject);
     }
 
     /** Inserts a new object into the array at the given index.
@@ -275,7 +276,7 @@ public:
         @see add, addSorted, addIfNotAlreadyThere, set
     */
     void insert (int indexToInsertAt,
-                 const ObjectClass* const newObject) noexcept
+                 ObjectClass* const newObject) noexcept
     {
         if (indexToInsertAt >= 0)
         {
diff --git a/modules/juce_core/files/juce_File.h b/modules/juce_core/files/juce_File.h
index 86892ec5a4..880884629a 100644
--- a/modules/juce_core/files/juce_File.h
+++ b/modules/juce_core/files/juce_File.h
@@ -952,8 +952,6 @@ private:
     bool setFileTimesInternal (int64 m, int64 a, int64 c) const;
     void getFileTimesInternal (int64& m, int64& a, int64& c) const;
     bool setFileReadOnlyInternal (bool) const;
-
-    JUCE_LEAK_DETECTOR (File)
 };
 
 #endif   // __JUCE_FILE_JUCEHEADER__
diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h
index 4425f95a95..dca951d7b6 100644
--- a/modules/juce_core/juce_core.h
+++ b/modules/juce_core/juce_core.h
@@ -101,7 +101,7 @@
  #define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0
 #endif
 
-/*  Config: JUCE_INCLUDE_ZLIB_CODE
+/** Config: JUCE_INCLUDE_ZLIB_CODE
     This can be used to disable Juce's embedded 3rd-party zlib code.
     You might need to tweak this if you're linking to an external zlib library in your app,
     but for normal apps, this option should be left alone.
diff --git a/modules/juce_core/threads/juce_WaitableEvent.h b/modules/juce_core/threads/juce_WaitableEvent.h
index 72ed1b5628..94197d3ebc 100644
--- a/modules/juce_core/threads/juce_WaitableEvent.h
+++ b/modules/juce_core/threads/juce_WaitableEvent.h
@@ -50,7 +50,7 @@ public:
                             method is called. If manualReset is true, then once the event is signalled,
                             the only way to reset it will be by calling the reset() method.
     */
-    WaitableEvent (bool manualReset = false) noexcept;
+    explicit WaitableEvent (bool manualReset = false) noexcept;
 
     /** Destructor.