diff --git a/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h b/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h
index 7cfaa646d1..ebb1370e9b 100644
--- a/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h
+++ b/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h
@@ -37,7 +37,7 @@ public:
     //==============================================================================
     MidiDataConcatenator (const int initialBufferSize)
         : pendingData ((size_t) initialBufferSize),
-          pendingBytes (0), runningStatus (0), pendingDataTime (0)
+          pendingDataTime (0), pendingBytes (0), runningStatus (0)
     {
     }
 
@@ -164,8 +164,9 @@ private:
     }
 
     MemoryBlock pendingData;
-    int pendingBytes, runningStatus;
     double pendingDataTime;
+    int pendingBytes;
+    uint8 runningStatus;
 
     JUCE_DECLARE_NON_COPYABLE (MidiDataConcatenator);
 };
diff --git a/modules/juce_gui_basics/widgets/juce_ListBox.h b/modules/juce_gui_basics/widgets/juce_ListBox.h
index 7d7c508dc6..b0c6270468 100644
--- a/modules/juce_gui_basics/widgets/juce_ListBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ListBox.h
@@ -77,6 +77,11 @@ public:
         delete this component and return a new one.
 
         The component that your method returns will be deleted by the ListBox when it is no longer needed.
+
+        Bear in mind that if you put a custom component inside the row but still want the
+        listbox to automatically handle clicking, selection, etc, then you'll need to make sure
+        your custom component doesn't intercept all the mouse events that land on it, e.g by
+        using Component::setInterceptsMouseClicks().
     */
     virtual Component* refreshComponentForRow (int rowNumber, bool isRowSelected,
                                                Component* existingComponentToUpdate);