diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6f1dc3..1bc5774 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 if(COMPILER_SUPPORTS_CXX14)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 elseif(COMPILER_SUPPORTS_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 elseif(COMPILER_SUPPORTS_CXX0X)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 else()
diff --git a/fluent/Callback.h b/fluent/Callback.h
index d8f22de..d395548 100644
--- a/fluent/Callback.h
+++ b/fluent/Callback.h
@@ -52,7 +52,6 @@ namespace detail
     template<typename _CTy>
     using unwrap_callback_t = do_unwrap_callback<::fu::function_type_of_t<_CTy>>;
 
-    /*
     template<typename... Args>
     struct WeakProxyFactory
     {
@@ -70,7 +69,7 @@ namespace detail
             return CreateProxyFromWeak(WeakCallback<Args...>(shared_callback));
         }
     };
-    */
+
 
 } // detail
 
@@ -91,7 +90,7 @@ inline shared_callback_of_t<_CTy>
         (std::forward<callback_of_t<_CTy>>(callback));
 };
 
-/* Disabled due to clang errors
+/*
 template<typename... Args>
 inline auto make_weak_wrapped_callback(WeakCallback<Args...> const& weak_callback)
     -> Callback<Args...>
diff --git a/test.cpp b/test.cpp
index 8121357..d8da845 100644
--- a/test.cpp
+++ b/test.cpp
@@ -29,9 +29,12 @@ Continuable<SpellCastResult> CastSpell(int id)
 
 int main(int argc, char** argv)
 {
-    // typedef shared_callback_of_t<Callback<int>> sc1;
-    // typedef weak_callback_of_t<Callback<bool>> sc2;
+    shared_callback_of_t<Callback<int>> sc1;
+    weak_callback_of_t<Callback<bool>> sc2;
   
+    // make_weak_wrapped_callback(sc1);
+    // make_weak_wrapped_callback(sc2);
+    
     typedef Continuable<bool> cont123;
 
     // typedef Continuable<Callback<bool>>::type myty1;