diff --git a/examples/Demo/Source/Demos/GridDemo.cpp b/examples/Demo/Source/Demos/GridDemo.cpp
index 41c8e4d8d4..d804095e26 100644
--- a/examples/Demo/Source/Demos/GridDemo.cpp
+++ b/examples/Demo/Source/Demos/GridDemo.cpp
@@ -27,7 +27,7 @@
 #include "../JuceDemoHeader.h"
 
 // these classes are C++11-only
-#if JUCE_HAS_CONSTEXPR
+#if JUCE_HAS_CONSTEXPR && JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
 
 struct GridDemo   : public Component
 {
diff --git a/modules/juce_core/misc/juce_StdFunctionCompat.h b/modules/juce_core/misc/juce_StdFunctionCompat.h
index 3d5381a461..322247e8a9 100644
--- a/modules/juce_core/misc/juce_StdFunctionCompat.h
+++ b/modules/juce_core/misc/juce_StdFunctionCompat.h
@@ -154,7 +154,7 @@ namespace std
         FunctorHolderBase<Result, Arguments...>* getFunctorStorage (int size)
         {
             return reinterpret_cast<FunctorHolderBase<Result, Arguments...>*>
-                       (size > functorHolderStackSize ? new char [size]
+                       (size > functorHolderStackSize ? new char [static_cast<unsigned long> (size)]
                                                       : &(stackFunctorStorage[0]));
         }