diff --git a/gtwrap/pybind_wrapper.py b/gtwrap/pybind_wrapper.py
index 1a3f10bf5..31d8d4444 100755
--- a/gtwrap/pybind_wrapper.py
+++ b/gtwrap/pybind_wrapper.py
@@ -412,7 +412,7 @@ class PybindWrapper:
 
     def wrap_instantiated_declaration(
             self, instantiated_decl: instantiator.InstantiatedDeclaration):
-        """Wrap the class."""
+        """Wrap the forward declaration."""
         module_var = self._gen_module_var(instantiated_decl.namespaces())
         cpp_class = instantiated_decl.to_cpp()
         if cpp_class in self.ignore_classes:
@@ -420,7 +420,7 @@ class PybindWrapper:
 
         res = (
             '\n    py::class_<{cpp_class}, '
-            '{shared_ptr_type}::shared_ptr<{cpp_class}>>({module_var}, "{class_name}")'
+            '{shared_ptr_type}::shared_ptr<{cpp_class}>>({module_var}, "{class_name}");'
         ).format(shared_ptr_type=('boost' if self.use_boost else 'std'),
                  cpp_class=cpp_class,
                  class_name=instantiated_decl.name,
diff --git a/matlab.h b/matlab.h
index fbed0b2e2..645ba8edf 100644
--- a/matlab.h
+++ b/matlab.h
@@ -37,15 +37,16 @@ extern "C" {
 #include <mex.h>
 }
 
-#include <boost/shared_ptr.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/make_shared.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <list>
-#include <string>
-#include <sstream>
-#include <typeinfo>
 #include <set>
+#include <sstream>
 #include <streambuf>
+#include <string>
+#include <typeinfo>
 
 using namespace std;
 using namespace boost; // not usual, but for conciseness of generated code
diff --git a/tests/expected/python/class_pybind.cpp b/tests/expected/python/class_pybind.cpp
index fd5398912..95171def4 100644
--- a/tests/expected/python/class_pybind.cpp
+++ b/tests/expected/python/class_pybind.cpp
@@ -105,7 +105,7 @@ PYBIND11_MODULE(class_py, m_) {
                         return redirect.str();
                     }, py::arg("s") = "factor: ", py::arg("keyFormatter") = gtsam::DefaultKeyFormatter);
 
-    py::class_<SuperCoolFactor<gtsam::Pose3>, std::shared_ptr<SuperCoolFactor<gtsam::Pose3>>>(m_, "SuperCoolFactorPose3")
+    py::class_<SuperCoolFactor<gtsam::Pose3>, std::shared_ptr<SuperCoolFactor<gtsam::Pose3>>>(m_, "SuperCoolFactorPose3");
 
 #include "python/specializations.h"
 
diff --git a/tests/fixtures/inheritance.i b/tests/fixtures/inheritance.i
index e63f8e689..a3b64ed4b 100644
--- a/tests/fixtures/inheritance.i
+++ b/tests/fixtures/inheritance.i
@@ -1,6 +1,5 @@
 // A base class
 virtual class MyBase {
-
 };
 
 // A templated class