diff --git a/3rdpatry/http-client-lite/include/jdl/httpclientlite.h b/3rdpatry/http-client-lite/include/jdl/httpclientlite.h
index 4432308..36dbe18 100644
--- a/3rdpatry/http-client-lite/include/jdl/httpclientlite.h
+++ b/3rdpatry/http-client-lite/include/jdl/httpclientlite.h
@@ -33,6 +33,8 @@
 # define PLATFORM_LINUX
 #elif defined (_WIN32) || defined (_WIN64)
 # define PLATFORM_WINDOWS
+#elif defined (__APPLE__)
+# define PLATFORM_APPLE
 #else
 /* TODO:
  *  - Added Apple OS */
@@ -51,15 +53,15 @@
 #include <sys/types.h>
 
 #if defined (PLATFORM_WINDOWS)
-# include <WinSock2.h>
-# include <WS2tcpip.h>
+# include <winsock2.h>
+# include <ws2tcpip.h>
 
   typedef SOCKET socktype_t;
   typedef int socklen_t;
 
 # pragma comment(lib, "ws2_32.lib")
 
-#elif defined (PLATFORM_LINUX)
+#elif defined (PLATFORM_LINUX) || defined (PLATFORM_APPLE)
 # include <unistd.h>
 # include <sys/socket.h>
 # include <netdb.h>
diff --git a/core/include/prometheus/builder.h b/core/include/prometheus/builder.h
index e5549c2..df58c55 100644
--- a/core/include/prometheus/builder.h
+++ b/core/include/prometheus/builder.h
@@ -14,7 +14,7 @@ namespace prometheus {
     std::string help_;
 
   public:
-    Builder& Labels(const std::map<const std::string, const std::string>& labels) {
+    Builder& Labels(const std::map<std::string, std::string>& labels) {
       labels_ = labels;
       return *this;
     }
diff --git a/core/include/prometheus/family.h b/core/include/prometheus/family.h
index 1c625c1..74fcc8d 100644
--- a/core/include/prometheus/family.h
+++ b/core/include/prometheus/family.h
@@ -8,6 +8,7 @@
 #include <unordered_map>
 #include <vector>
 #include <cassert>
+#include <stdexcept>
 
 #include "prometheus/collectable.h"
 #include "prometheus/metric.h"
@@ -56,8 +57,8 @@ namespace prometheus {
     public:
 
       using Hash      = std::size_t;
-      using Label     = std::pair<const std::string, const std::string>;
-      using Labels    = std::map <const std::string, const std::string>;
+      using Label     = std::pair<std::string, std::string>;
+      using Labels    = std::map <std::string, std::string>;
       using MetricPtr = std::unique_ptr<Metric>;
 
       const   Metric::Type                 type;