diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aec2e99d..acee0a1af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ option(CASS_BUILD_EXAMPLES "Build examples" ON)
 #-------------------
 # Version
 #-------------------
+
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MINOR 0)
 set(PROJECT_VERSION_PATCH 0)
@@ -154,6 +155,7 @@ endif()
 #-------------------
 # Cassandra static and shared
 #-------------------
+
 include_directories(${INCLUDES})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -274,6 +276,7 @@ endif()
 #-------------------
 # Examples
 #-------------------
+
 if(CASS_BUILD_EXAMPLES)
   add_subdirectory(examples/async)
   add_subdirectory(examples/basic)
diff --git a/src/common.hpp b/src/common.hpp
index 19681da9d..b9aaa8117 100644
--- a/src/common.hpp
+++ b/src/common.hpp
@@ -48,7 +48,7 @@ inline size_t next_pow_2(size_t num) {
   size_t next = 2;
   size_t i = 0;
   while (next < num) {
-    next = 1 << i++;
+    next = static_cast<size_t>(1) << i++;
   }
   return next;
 }