diff --git a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h
index aaf1ce52bd..f47b8fe9a4 100644
--- a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h
+++ b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h
@@ -54,6 +54,7 @@ public:
     void selectionChanged();
     void fileClicked (const File& file, const MouseEvent& e);
     void fileDoubleClicked (const File& file);
+    void browserRootChanged (const File&) {}
     void showFile (const File& file);
     //[/UserMethods]
 
diff --git a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
index 639a993559..616d7239d7 100644
--- a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
@@ -37,7 +37,7 @@ namespace FlacNamespace
  #define FLAC__NO_DLL 1
 
  #if JUCE_MSVC
-  #pragma warning (disable: 4267 4127 4244 4996 4100 4701 4702 4013 4133 4206 4312 4505 4365 181 111)
+  #pragma warning (disable: 4267 4127 4244 4996 4100 4701 4702 4013 4133 4206 4312 4505 4365 4005 4334 181 111)
  #endif
 
  #if JUCE_MAC
diff --git a/modules/juce_core/zip/juce_ZipFile.cpp b/modules/juce_core/zip/juce_ZipFile.cpp
index 1909b952e3..8d7f37929c 100644
--- a/modules/juce_core/zip/juce_ZipFile.cpp
+++ b/modules/juce_core/zip/juce_ZipFile.cpp
@@ -87,7 +87,7 @@ public:
         if (headerSize <= 0)
             return 0;
 
-        howMany = (int) jmin ((int64) howMany, zipEntryInfo.compressedSize - pos);
+        howMany = (int) jmin ((int64) howMany, (int64) (zipEntryInfo.compressedSize - pos));
 
         if (inputStream == nullptr)
             return 0;
@@ -112,7 +112,7 @@ public:
 
     bool isExhausted()
     {
-        return headerSize <= 0 || pos >= zipEntryInfo.compressedSize;
+        return headerSize <= 0 || pos >= (int64) zipEntryInfo.compressedSize;
     }
 
     int64 getPosition()