diff --git a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
index aef8850d91..8b9a72c1ff 100644
--- a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
+++ b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
@@ -497,14 +497,14 @@ public:
     //==============================================================================
    #ifndef DOXYGEN
     // Note that these methods have now been replaced by getReadPointer() and getWritePointer()
-    JUCE_DEPRECATED (const float* getSampleData (int channel) const)            { return getReadPointer (channel); }
-    JUCE_DEPRECATED (const float* getSampleData (int channel, int index) const) { return getReadPointer (channel, index); }
-    JUCE_DEPRECATED (float* getSampleData (int channel))                        { return getWritePointer (channel); }
-    JUCE_DEPRECATED (float* getSampleData (int channel, int index))             { return getWritePointer (channel, index); }
+    JUCE_DEPRECATED_WITH_BODY (const float* getSampleData (int channel) const,            { return getReadPointer (channel); })
+    JUCE_DEPRECATED_WITH_BODY (const float* getSampleData (int channel, int index) const, { return getReadPointer (channel, index); })
+    JUCE_DEPRECATED_WITH_BODY (float* getSampleData (int channel),                        { return getWritePointer (channel); })
+    JUCE_DEPRECATED_WITH_BODY (float* getSampleData (int channel, int index),             { return getWritePointer (channel, index); })
 
     // These have been replaced by getArrayOfReadPointers() and getArrayOfWritePointers()
-    JUCE_DEPRECATED (const float** getArrayOfChannels() const)                  { return getArrayOfReadPointers(); }
-    JUCE_DEPRECATED (float** getArrayOfChannels())                              { return getArrayOfWritePointers(); }
+    JUCE_DEPRECATED_WITH_BODY (const float** getArrayOfChannels() const,                  { return getArrayOfReadPointers(); })
+    JUCE_DEPRECATED_WITH_BODY (float** getArrayOfChannels(),                              { return getArrayOfWritePointers(); })
    #endif
 
 private:
@@ -517,7 +517,7 @@ private:
     bool isClear;
 
     void allocateData();
-    void allocateChannels (float* const* dataToReferTo, int offset);
+    void allocateChannels (float* const*, int offset);
 
     JUCE_LEAK_DETECTOR (AudioSampleBuffer)
 };
diff --git a/modules/juce_core/files/juce_File.cpp b/modules/juce_core/files/juce_File.cpp
index 8f80a5a01d..695d48e68d 100644
--- a/modules/juce_core/files/juce_File.cpp
+++ b/modules/juce_core/files/juce_File.cpp
@@ -355,7 +355,7 @@ File File::getChildFile (StringRef relativePath) const
     if (isAbsolutePath (relativePath))
         return File (String (relativePath.text));
 
-    if (relativePath.text[0] != '.')
+    if (relativePath[0] != '.')
         return File (addTrailingSeparator (fullPath) + relativePath);
 
     String path (fullPath);
@@ -368,11 +368,11 @@ File File::getChildFile (StringRef relativePath) const
 
     while (relativePath[0] == '.')
     {
-        const juce_wchar secondChar = relativePath.text[1];
+        const juce_wchar secondChar = relativePath[1];
 
         if (secondChar == '.')
         {
-            const juce_wchar thirdChar = relativePath.text[2];
+            const juce_wchar thirdChar = relativePath[2];
 
             if (thirdChar == 0 || thirdChar == separator)
             {