diff --git a/src/api/ApiRouter.cpp b/src/api/ApiRouter.cpp
index bdedac4d..beee8fd3 100644
--- a/src/api/ApiRouter.cpp
+++ b/src/api/ApiRouter.cpp
@@ -51,13 +51,15 @@
 #include "workers/Workers.h"
 
 
-static inline double normalize(double d)
+static inline rapidjson::Value normalize(double d)
 {
+    using namespace rapidjson;
+
     if (!isnormal(d)) {
-        return 0.0;
+        return Value(kNullType);
     }
 
-    return floor(d * 100.0) / 100.0;
+    return Value(floor(d * 100.0) / 100.0);
 }
 
 
diff --git a/src/version.h b/src/version.h
index 4e8fee45..b6ae7102 100644
--- a/src/version.h
+++ b/src/version.h
@@ -39,7 +39,9 @@
 #define APP_VER_PATCH  2
 
 #ifdef _MSC_VER
-#   if (_MSC_VER >= 1910)
+#   if (_MSC_VER >= 1920)
+#       define MSVC_VERSION 2019
+#   elif (_MSC_VER >= 1910 && _MSC_VER < 1920)
 #       define MSVC_VERSION 2017
 #   elif _MSC_VER == 1900
 #       define MSVC_VERSION 2015