diff --git a/include/crow/json.h b/include/crow/json.h
index 928b4541e..ce8ac72e5 100644
--- a/include/crow/json.h
+++ b/include/crow/json.h
@@ -16,13 +16,16 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/operators.hpp>
 #include <vector>
-#include <math.h>
+#include <cmath>
 
 #include "crow/utility.h"
 #include "crow/settings.h"
 #include "crow/returnable.h"
 #include "crow/logging.h"
 
+using std::isinf;
+using std::isnan;
+
 
 namespace crow
 {
diff --git a/include/crow/routing.h b/include/crow/routing.h
index 714dcb8fc..c2ca93477 100644
--- a/include/crow/routing.h
+++ b/include/crow/routing.h
@@ -775,7 +775,7 @@ namespace crow
             if (pos == req_url.size())
             {
                 found_BP = std::move(*blueprints);
-                return {node->rule_index, *blueprints, *params};
+                return std::tuple<uint16_t, std::vector<uint16_t>, routing_params>{node->rule_index, *blueprints, *params};
             }
 
             bool found_fragment = false;
@@ -902,7 +902,7 @@ namespace crow
             if (!found_fragment)
                 found_BP = std::move(*blueprints);
 
-            return {found, found_BP, match_params}; //Called after all the recursions have been done
+            return std::tuple<uint16_t, std::vector<uint16_t>, routing_params>{found, found_BP, match_params}; //Called after all the recursions have been done
         }
 
         //This functions assumes any blueprint info passed is valid