diff --git a/.gitmodules b/.gitmodules
index e9a187c0..2be064a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "spdlog"]
 	path = spdlog
-	url = git@github.com:gabime/spdlog.git
+	url = https://github.com/gabime/spdlog.git
 [submodule "json"]
 	path = json
-	url = git@github.com:nlohmann/json.git
+	url = https://github.com/nlohmann/json.git
 [submodule "asttoc/fmt"]
 	path = asttoc/fmt
-	url = git@github.com:fmtlib/fmt.git
+	url = https://github.com/fmtlib/fmt.git
diff --git a/README.md b/README.md
index a6330dc8..45d85e19 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,7 @@ extern "C" {
 
 
 ## Quick start
-You must have LLVM and clang 11.0.0 installed. To run the tests you'll need OpenEXR 2.5.5 installed. Other versions may work but the tests will fail as they rely on diffing the output, which will have the version numbers baked into the type names.
+You must have LLVM and clang 14.0.0 installed. To run the tests you'll need OpenEXR 2.5.5 installed. Other versions may work but the tests will fail as they rely on diffing the output, which will have the version numbers baked into the type names.
 
 ### Checkout
 The repository includes spdlog and nlohmann::json as submodules, so clone with `--recursive`:
diff --git a/astgen/src/ast_utils.cpp b/astgen/src/ast_utils.cpp
index ee4c387c..ed62faf4 100644
--- a/astgen/src/ast_utils.cpp
+++ b/astgen/src/ast_utils.cpp
@@ -129,7 +129,7 @@ mangle_template_args(const TemplateArgumentList& args) {
             result.push_back("NullPtr");
         } else if (arg.getKind() == TemplateArgument::ArgKind::Integral) {
             result.push_back(
-                ps::replace(arg.getAsIntegral().toString(10), "-", "neg"));
+                ps::replace(std::to_string(arg.getAsIntegral().getExtValue()), "-", "neg"));
         } else if (arg.getKind() == TemplateArgument::ArgKind::Template) {
             result.push_back("Template");
         } else if (arg.getKind() ==
diff --git a/astgen/src/astgen.cpp b/astgen/src/astgen.cpp
index 04cd02dc..57f85ca3 100644
--- a/astgen/src/astgen.cpp
+++ b/astgen/src/astgen.cpp
@@ -102,7 +102,7 @@ static cl::list<std::string>
 int main(int argc_, const char** argv_) {
     // set up logging
     auto _console = spdlog::stdout_color_mt("console");
-    std::string cwd = fs::current_path();
+    const char* cwd = fs::current_path().c_str();
 
     // FIXME: there's got to be a more sensible way of doing this but I can't
     // figure it out...
@@ -143,7 +143,8 @@ int main(int argc_, const char** argv_) {
     // grab any user-specified include directories from the command line
     cppmm::PROJECT_INCLUDES = parse_project_includes(argc, argv, cwd);
 
-    CommonOptionsParser OptionsParser(argc, argv, CppmmCategory);
+    ExitOnError eoe;
+    CommonOptionsParser OptionsParser = eoe(CommonOptionsParser::create(argc, argv, CppmmCategory));
 
     // Set up logging
     switch (opt_verbosity) {
diff --git a/astgen/src/process_binding.cpp b/astgen/src/process_binding.cpp
index e15de3d7..a9eeb6d7 100644
--- a/astgen/src/process_binding.cpp
+++ b/astgen/src/process_binding.cpp
@@ -811,7 +811,7 @@ void process_enum_decl(const EnumDecl* ed, std::string filename) {
     for (const auto& ecd : ed->enumerators()) {
         SPDLOG_DEBUG("        {}", ecd->getNameAsString());
         variants.push_back(std::make_pair(ecd->getNameAsString(),
-                                          ecd->getInitVal().toString(10)));
+                                          std::to_string(ecd->getInitVal().getExtValue())));
     }
 
     std::vector<std::string> attrs = get_attrs(ed);
@@ -860,7 +860,7 @@ void process_library_enum_decl(const EnumDecl* ed, std::string filename,
     for (const auto& ecd : ed->enumerators()) {
         SPDLOG_DEBUG("        {}", ecd->getNameAsString());
         variants.push_back(std::make_pair(ecd->getNameAsString(),
-                                          ecd->getInitVal().toString(10)));
+                                          std::to_string(ecd->getInitVal().getExtValue())));
     }
 
     NodeId new_id = NODES.size();
diff --git a/genbind/src/genbind.cpp b/genbind/src/genbind.cpp
index 47cafb59..86f9c9c0 100644
--- a/genbind/src/genbind.cpp
+++ b/genbind/src/genbind.cpp
@@ -2026,7 +2026,7 @@ void process_enum_decl(const EnumDecl* ed, std::string filename) {
     for (const auto& ecd : ed->enumerators()) {
         SPDLOG_DEBUG("        {}", ecd->getNameAsString());
         variants.push_back(std::make_pair(ecd->getNameAsString(),
-                                          ecd->getInitVal().toString(10)));
+                                          std::to_string(ecd->getInitVal().getExtValue())));
     }
 
     NodeId new_id = NODES.size();
@@ -2402,7 +2402,8 @@ int main(int argc_, const char** argv_) {
 
     project_includes = parse_project_includes(argc, argv);
 
-    CommonOptionsParser OptionsParser(argc, argv, CppmmCategory);
+    ExitOnError eoe;
+    CommonOptionsParser OptionsParser = eoe(CommonOptionsParser::create(argc, argv, CppmmCategory));
 
     switch (opt_verbosity) {
     case 0: