diff --git a/source/cell/cell.cpp b/source/cell/cell.cpp
index de6c6c8a..b2a4af9c 100644
--- a/source/cell/cell.cpp
+++ b/source/cell/cell.cpp
@@ -1032,7 +1032,7 @@ void cell::comment(const class comment &new_comment)
     // todo: make this cell_position.first += get_width() instead
     if (get_worksheet().has_column_properties(get_column()))
     {
-        cell_position.first += get_worksheet().get_column_properties(get_column()).width;
+        cell_position.first += static_cast<int>(get_worksheet().get_column_properties(get_column()).width);
     }
     else
     {
diff --git a/source/detail/xlsx_consumer.cpp b/source/detail/xlsx_consumer.cpp
index d79ab1f1..61ce2dba 100644
--- a/source/detail/xlsx_consumer.cpp
+++ b/source/detail/xlsx_consumer.cpp
@@ -792,26 +792,11 @@ void xlsx_consumer::read_workbook()
                 }
             }
 
-            if (parser().attribute_present("defaultThemeVersion"))
-            {
-                parser().attribute("defaultThemeVersion");
-            }
-
-            // todo: turn these structures into a method like skip_attribute(string name, bool optional)
-            if (parser().attribute_present("backupFile"))
-            {
-                parser().attribute("backupFile");
-            }
-
-            if (parser().attribute_present("showObjects"))
-            {
-                parser().attribute("showObjects");
-            }
-
-            if (parser().attribute_present("filterPrivacy"))
-            {
-                parser().attribute("filterPrivacy");
-            }
+            skip_attribute("codeName");
+            skip_attribute("defaultThemeVersion");
+            skip_attribute("backupFile");
+            skip_attribute("showObjects");
+            skip_attribute("filterPrivacy");
 
             parser().next_expect(xml::parser::event_type::end_element, xmlns, "workbookPr");
         }
@@ -2403,5 +2388,13 @@ void xlsx_consumer::read_block(const std::unordered_map<xml::qname, std::functio
     parser().next_expect(xml::parser::event_type::end_element, parent_block);
 }
 
+void xlsx_consumer::skip_attribute(const std::string &name)
+{
+    if (parser().attribute_present(name))
+    {
+        parser().attribute(name);
+    }
+}
+
 } // namespace detail
 } // namepsace xlnt
diff --git a/source/detail/xlsx_consumer.hpp b/source/detail/xlsx_consumer.hpp
index 45dacedd..4a71e8d2 100644
--- a/source/detail/xlsx_consumer.hpp
+++ b/source/detail/xlsx_consumer.hpp
@@ -226,6 +226,8 @@ private:
     
     void read_part(const std::vector<relationship> &rel_chain);
 
+    void skip_attribute(const std::string &name);
+
 	/// <summary>
 	/// The ZIP file containing the files that make up the OOXML package.
 	/// </summary>
diff --git a/source/workbook/workbook.cpp b/source/workbook/workbook.cpp
index 218c1c03..e97e62b9 100644
--- a/source/workbook/workbook.cpp
+++ b/source/workbook/workbook.cpp
@@ -28,7 +28,7 @@
 #include <functional>
 #include <set>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #include <codecvt> // utf-8 -> utf-16 conversion
 #endif
 
diff --git a/third-party/botan b/third-party/botan
index 923a95d5..523b2a4c 160000
--- a/third-party/botan
+++ b/third-party/botan
@@ -1 +1 @@
-Subproject commit 923a95d546df5b6d31f39b0af900d0361fb2e6a6
+Subproject commit 523b2a4ca48fa5cf04ea371aabe7167ce2e5cd13