diff --git a/cpp/proto b/cpp/proto
index 519c6f87c8cea41244c9001d4ab666ecccbade3e..c581306f8816e5e8b708c9097e402354bb41b84a 160000
--- a/cpp/proto
+++ b/cpp/proto
@@ -1 +1 @@
-Subproject commit 519c6f87c8cea41244c9001d4ab666ecccbade3e
+Subproject commit c581306f8816e5e8b708c9097e402354bb41b84a
diff --git a/cpp/src/vereign/core/time.hh b/cpp/src/vereign/core/time.hh
index 75747fd34965d8682cfbd9e87ffae960d049e9db..120ddd8e0bc23b52c8d7cb3c994f8d2f78eac85b 100644
--- a/cpp/src/vereign/core/time.hh
+++ b/cpp/src/vereign/core/time.hh
@@ -26,7 +26,14 @@ auto MakePosixTime(
   using namespace boost::posix_time;
   using namespace boost::gregorian;
 
-  return ptime(date{year, month, day}, time_duration(hours, seconds, milliseconds));
+  return ptime(
+    date{
+      static_cast<date::year_type>(year),
+      static_cast<date::month_type>(month),
+      static_cast<date::day_type>(day)
+    },
+    time_duration(hours, seconds, milliseconds)
+  );
 }
 
 auto MakeTimeUTC(
@@ -40,7 +47,16 @@ auto MakeTimeUTC(
   using namespace boost::posix_time;
   using namespace boost::gregorian;
 
-  return PosixTimeToTime(ptime(date{year, month, day}, time_duration(hours, seconds, milliseconds)));
+  return PosixTimeToTime(
+    ptime(
+      date{
+        static_cast<date::year_type>(year),
+        static_cast<date::month_type>(month),
+        static_cast<date::day_type>(day)
+      },
+      time_duration(hours, seconds, milliseconds)
+    )
+  );
 }
 
 auto MakeTimeUTCFromString(const std::string& str) -> time_t {
diff --git a/cpp/src/vereign/crypto/cert.cc b/cpp/src/vereign/crypto/cert.cc
index 5ac2479cbeb33f64edc8786a867f70543863eba7..a715c17b0c9c4552f8c8610099cbc44e0cc2cec4 100644
--- a/cpp/src/vereign/crypto/cert.cc
+++ b/cpp/src/vereign/crypto/cert.cc
@@ -7,6 +7,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/digest.h>
 #include <openssl/pem.h>
+#include <sstream>
 
 namespace {
   constexpr const char* certDefaultHashAlg = "SHA256";
diff --git a/cpp/tests/vereign/crypto/test_data/.gitattributes b/cpp/tests/vereign/crypto/test_data/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..fe505b2758cb7a383f6300ca9a64e2843247504b
--- /dev/null
+++ b/cpp/tests/vereign/crypto/test_data/.gitattributes
@@ -0,0 +1 @@
+* text=false