diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99babdb..98c5594f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ message(STATUS "CMake version: ${CMAKE_VERSION}")
 cmake_minimum_required(VERSION 2.8.12)
 
 if (POLICY CMP0048) # Version variables
-  cmake_policy(SET CMP0048 OLD)
+  cmake_policy(SET CMP0048 NEW)
 endif ()
 
 if (POLICY CMP0063) # Visibility
diff --git a/fmt/format.h b/fmt/format.h
index 649d39ee..761baa33 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -2099,7 +2099,6 @@ void ArgMap<Char>::init(const ArgList &args) {
         /*nothing*/;
       }
     }
-    return;
   }
   for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
     internal::Arg::Type arg_type = args.type(i);