diff --git a/cmake/macros/FindBoost.cmake b/cmake/macros/FindBoost.cmake
index 90bba26db70..ebd1c29598a 100644
--- a/cmake/macros/FindBoost.cmake
+++ b/cmake/macros/FindBoost.cmake
@@ -349,6 +349,8 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
     else()
       set (_boost_COMPILER "-il")
     endif()
+  elseif (MSVC14)
+    set(_boost_COMPILER "-vc140")
   elseif (MSVC12)
     set(_boost_COMPILER "-vc120")
   elseif (MSVC11)
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 3d44c975c96..b0ad2408710 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -393,7 +393,12 @@ class ByteBuffer
             lt.tm_mon = (packedDate >> 20) & 0xF;
             lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
 
+// To-Do: find a better way here
+#if !defined(timezone)
+            return uint32(mktime(&lt) + _timezone);
+#else
             return uint32(mktime(&lt) + timezone);
+#endif
         }
 
         ByteBuffer& ReadPackedTime(uint32& time)