diff --git a/modules/juce_core/logging/juce_Logger.cpp b/modules/juce_core/logging/juce_Logger.cpp
index 0a600ef856..3b3356bad2 100644
--- a/modules/juce_core/logging/juce_Logger.cpp
+++ b/modules/juce_core/logging/juce_Logger.cpp
@@ -46,7 +46,7 @@ void Logger::writeToLog (const String& message)
 }
 
 #if JUCE_LOG_ASSERTIONS || JUCE_DEBUG
-void JUCE_API logAssertion (const char* const filename, const int lineNum) noexcept
+void JUCE_API JUCE_CALLTYPE logAssertion (const char* const filename, const int lineNum) noexcept
 {
     String m ("JUCE Assertion failure in ");
     m << File::createFileWithoutCheckingPath (filename).getFileName() << ':' << lineNum;
diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h
index 938cb0b812..380879cd08 100644
--- a/modules/juce_core/system/juce_StandardHeader.h
+++ b/modules/juce_core/system/juce_StandardHeader.h
@@ -156,7 +156,7 @@
 namespace juce
 {
     extern JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger();
-    extern JUCE_API void logAssertion (const char* file, int line) noexcept;
+    extern JUCE_API void JUCE_CALLTYPE logAssertion (const char* file, int line) noexcept;
 
     #include "../memory/juce_Memory.h"
     #include "../maths/juce_MathsFunctions.h"
diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
index 5aa0443e4d..07485ecd99 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
@@ -738,12 +738,12 @@ private:
 
         for (int col = 0; col < numColumns; ++col)
         {
-            int i, colW = options.standardHeight, colH = 0;
+            int colW = options.standardHeight, colH = 0;
 
             const int numChildren = jmin (items.size() - childNum,
                                           (items.size() + numColumns - 1) / numColumns);
 
-            for (i = numChildren; --i >= 0;)
+            for (int i = numChildren; --i >= 0;)
             {
                 colW = jmax (colW, items.getUnchecked (childNum + i)->getWidth());
                 colH += items.getUnchecked (childNum + i)->getHeight();