diff --git a/examples/DiscreteBayesNetExample.cpp b/examples/DiscreteBayesNetExample.cpp
index 629043431..5dca116c3 100644
--- a/examples/DiscreteBayesNetExample.cpp
+++ b/examples/DiscreteBayesNetExample.cpp
@@ -18,7 +18,7 @@
 
 #include <gtsam/discrete/DiscreteFactorGraph.h>
 #include <gtsam/discrete/DiscreteMarginals.h>
-#include <gtsam/inference/BayesNet-inst.h>
+#include <gtsam/inference/BayesNet.h>
 
 #include <iomanip>
 
diff --git a/examples/HMMExample.cpp b/examples/HMMExample.cpp
index a56058633..ee861e381 100644
--- a/examples/HMMExample.cpp
+++ b/examples/HMMExample.cpp
@@ -18,7 +18,7 @@
 
 #include <gtsam/discrete/DiscreteFactorGraph.h>
 #include <gtsam/discrete/DiscreteMarginals.h>
-#include <gtsam/inference/BayesNet-inst.h>
+#include <gtsam/inference/BayesNet.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
index 37ae1dd9a..1c1138438 100644
--- a/gtsam/base/Matrix.h
+++ b/gtsam/base/Matrix.h
@@ -610,5 +610,11 @@ namespace boost {
       split_free(ar, m, version);
     }
 
+    // specialized to Matrix for MATLAB wrapper
+    template <class Archive>
+    void serialize(Archive& ar, gtsam::Matrix& m, const unsigned int version) {
+      split_free(ar, m, version);
+    }
+
   } // namespace serialization
 } // namespace boost
diff --git a/gtsam/discrete/tests/testDiscreteBayesTree.cpp b/gtsam/discrete/tests/testDiscreteBayesTree.cpp
index 11a88af59..ecf485036 100644
--- a/gtsam/discrete/tests/testDiscreteBayesTree.cpp
+++ b/gtsam/discrete/tests/testDiscreteBayesTree.cpp
@@ -19,7 +19,7 @@
 #include <gtsam/discrete/DiscreteBayesNet.h>
 #include <gtsam/discrete/DiscreteBayesTree.h>
 #include <gtsam/discrete/DiscreteFactorGraph.h>
-#include <gtsam/inference/BayesNet-inst.h>
+#include <gtsam/inference/BayesNet.h>
 
 #include <boost/assign/std/vector.hpp>
 using namespace boost::assign;
diff --git a/gtsam/discrete/tests/testDiscreteFactorGraph.cpp b/gtsam/discrete/tests/testDiscreteFactorGraph.cpp
index 7a0e1eaf7..1defd5acf 100644
--- a/gtsam/discrete/tests/testDiscreteFactorGraph.cpp
+++ b/gtsam/discrete/tests/testDiscreteFactorGraph.cpp
@@ -19,7 +19,7 @@
 #include <gtsam/discrete/DiscreteFactorGraph.h>
 #include <gtsam/discrete/DiscreteEliminationTree.h>
 #include <gtsam/discrete/DiscreteBayesTree.h>
-#include <gtsam/inference/BayesNet-inst.h>
+#include <gtsam/inference/BayesNet.h>
 
 #include <CppUnitLite/TestHarness.h>
 
diff --git a/gtsam/geometry/SOn.h b/gtsam/geometry/SOn.h
index f44c578cc..a6392c2f9 100644
--- a/gtsam/geometry/SOn.h
+++ b/gtsam/geometry/SOn.h
@@ -340,7 +340,7 @@ void serialize(
   const unsigned int file_version
 ) {
   Matrix& M = Q.matrix_;
-  ar& M;
+  ar& BOOST_SERIALIZATION_NVP(M);
 }
 
 /*
diff --git a/gtsam/inference/BayesNet.h b/gtsam/inference/BayesNet.h
index a69fb9b8c..0597ece98 100644
--- a/gtsam/inference/BayesNet.h
+++ b/gtsam/inference/BayesNet.h
@@ -69,4 +69,6 @@ namespace gtsam {
     void saveGraph(const std::string &s, const KeyFormatter& keyFormatter = DefaultKeyFormatter) const;
   };
 
-}
\ No newline at end of file
+}
+
+#include <gtsam/inference/BayesNet-inst.h>