diff --git a/modules/juce_core/network/juce_Socket.cpp b/modules/juce_core/network/juce_Socket.cpp
index 9e265b8e18..52a6c258cb 100644
--- a/modules/juce_core/network/juce_Socket.cpp
+++ b/modules/juce_core/network/juce_Socket.cpp
@@ -571,7 +571,7 @@ int DatagramSocket::write (const void* sourceBuffer, const int numBytesToWrite)
     return connected ? (int) sendto (handle, (const char*) sourceBuffer,
                                      (size_t) numBytesToWrite, 0,
                                      static_cast <const struct addrinfo*> (serverAddress)->ai_addr,
-                                     static_cast <const struct addrinfo*> (serverAddress)->ai_addrlen)
+                                     (juce_socklen_t) static_cast <const struct addrinfo*> (serverAddress)->ai_addrlen)
                      : -1;
 }
 
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooser.h b/modules/juce_gui_basics/filebrowser/juce_FileChooser.h
index 9be9dcaac4..4743607893 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileChooser.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileChooser.h
@@ -100,14 +100,14 @@ public:
                     method to find out what it was. Returns false if they cancelled instead.
         @see browseForFileToSave, browseForDirectory
     */
-    bool browseForFileToOpen (FilePreviewComponent* previewComponent = 0);
+    bool browseForFileToOpen (FilePreviewComponent* previewComponent = nullptr);
 
     /** Same as browseForFileToOpen, but allows the user to select multiple files.
 
         The files that are returned can be obtained by calling getResults(). See
         browseForFileToOpen() for more info about the behaviour of this method.
     */
-    bool browseForMultipleFilesToOpen (FilePreviewComponent* previewComponent = 0);
+    bool browseForMultipleFilesToOpen (FilePreviewComponent* previewComponent = nullptr);
 
     /** Shows a dialog box to choose a file to save.
 
@@ -141,7 +141,7 @@ public:
         The files that are returned can be obtained by calling getResults(). See
         browseForFileToOpen() for more info about the behaviour of this method.
     */
-    bool browseForMultipleFilesOrDirectories (FilePreviewComponent* previewComponent = 0);
+    bool browseForMultipleFilesOrDirectories (FilePreviewComponent* previewComponent = nullptr);
 
     //==============================================================================
     /** Returns the last file that was chosen by one of the browseFor methods.