diff --git a/source/detail/number_formatter.cpp b/source/detail/number_formatter.cpp
index ae106100..250aae39 100644
--- a/source/detail/number_formatter.cpp
+++ b/source/detail/number_formatter.cpp
@@ -31,7 +31,7 @@ namespace {
 
 const std::unordered_map<int, std::string> known_locales()
 {
-    const std::unordered_map<int, std::string> *all =
+    static const std::unordered_map<int, std::string> *all =
         new std::unordered_map<int, std::string>(
         {
              { 0x401, "Arabic - Saudi Arabia" },
diff --git a/source/detail/xlsx_consumer.cpp b/source/detail/xlsx_consumer.cpp
index 59bf230d..a8a96cb0 100644
--- a/source/detail/xlsx_consumer.cpp
+++ b/source/detail/xlsx_consumer.cpp
@@ -2138,7 +2138,7 @@ std::vector<std::string> xlsx_consumer::read_namespaces()
     return namespaces;
 }
 
-bool xlsx_consumer::in_element(const xml::qname &name)
+bool xlsx_consumer::in_element(const xml::qname &/*name*/)
 {
     if (parser().peek() == xml::parser::event_type::end_element)
     {
diff --git a/source/detail/xlsx_crypto.cpp b/source/detail/xlsx_crypto.cpp
index 29f9bed9..b39a3289 100644
--- a/source/detail/xlsx_crypto.cpp
+++ b/source/detail/xlsx_crypto.cpp
@@ -618,9 +618,9 @@ struct crypto_helper
             iv.resize(16);
 
             auto segment_begin = encrypted_package.begin() + static_cast<std::ptrdiff_t>(i);
-            auto current_segment_length = static_cast<std::ptrdiff_t>(
-                std::min(segment_length, encrypted_package.size() - i));
-            auto segment_end = encrypted_package.begin() + i + current_segment_length;
+            auto current_segment_length = std::min(segment_length, encrypted_package.size() - i);
+            auto segment_end = encrypted_package.begin() 
+                + static_cast<std::ptrdiff_t>(i + current_segment_length);
             encrypted_segment.assign(segment_begin, segment_end);
             auto decrypted_segment = aes(key, iv, encrypted_segment,
                 cipher_chaining::cbc, cipher_direction::decryption);
diff --git a/source/detail/zip.cpp b/source/detail/zip.cpp
index 5b0786a7..9294121e 100644
--- a/source/detail/zip.cpp
+++ b/source/detail/zip.cpp
@@ -332,7 +332,7 @@ class ZipStreambufCompress : public std::streambuf
 
 public:
     ZipStreambufCompress(zip_file_header *central_header, std::ostream &stream)
-        : ostream(stream), header(central_header), valid(true)
+        : ostream(stream), strm({}), header(central_header), valid(true)
     {
         strm.zalloc = Z_NULL;
         strm.zfree = Z_NULL;
diff --git a/source/packaging/zip_file.cpp b/source/packaging/zip_file.cpp
deleted file mode 100644
index e69de29b..00000000
diff --git a/third-party/botan b/third-party/botan
index 5372d0b4..923a95d5 160000
--- a/third-party/botan
+++ b/third-party/botan
@@ -1 +1 @@
-Subproject commit 5372d0b499ad317ab3776c9ac92df866cc6a1e84
+Subproject commit 923a95d546df5b6d31f39b0af900d0361fb2e6a6
diff --git a/third-party/libstudxml b/third-party/libstudxml
index f94dd7cc..132522ca 160000
--- a/third-party/libstudxml
+++ b/third-party/libstudxml
@@ -1 +1 @@
-Subproject commit f94dd7ccee2014ab6240efbf5074b2f39dc32225
+Subproject commit 132522ca4c895e9b07d7e323d5529474806e5829
diff --git a/third-party/pugixml b/third-party/pugixml
index 91bf7023..a832e8a5 160000
--- a/third-party/pugixml
+++ b/third-party/pugixml
@@ -1 +1 @@
-Subproject commit 91bf70231aae8eddaccd5a6f5b0833712c471cb3
+Subproject commit a832e8a5eff11f58a00ca41ec51ff3895b0da165
diff --git a/third-party/utfcpp b/third-party/utfcpp
index 0232ab81..a5ad5ec9 160000
--- a/third-party/utfcpp
+++ b/third-party/utfcpp
@@ -1 +1 @@
-Subproject commit 0232ab8188b16ae6f2293a5817f1d9b0030879a3
+Subproject commit a5ad5ec9d936d63e9c010d1054f8b11fed0fabbc