diff --git a/gtsam/3rdparty/metis/CMakeLists.txt b/gtsam/3rdparty/metis/CMakeLists.txt
index dc26aecb2..f8da7ce6f 100644
--- a/gtsam/3rdparty/metis/CMakeLists.txt
+++ b/gtsam/3rdparty/metis/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(METIS)
 
 # Add flags for currect directory and below
diff --git a/gtsam/discrete/discrete.i b/gtsam/discrete/discrete.i
index 74de7a922..91176601c 100644
--- a/gtsam/discrete/discrete.i
+++ b/gtsam/discrete/discrete.i
@@ -288,7 +288,7 @@ class DiscreteBayesTree {
   const DiscreteBayesTreeClique* clique(size_t j) const;
   size_t numCachedSeparatorMarginals() const;
 
-  gtsam::DiscreteConditional marginalFactor(size_t key) const;
+  gtsam::DiscreteConditional* marginalFactor(size_t key) const;
   gtsam::DiscreteFactorGraph* joint(size_t j1, size_t j2) const;
   gtsam::DiscreteBayesNet* jointBayesNet(size_t j1, size_t j2) const;
 
@@ -369,7 +369,7 @@ class DiscreteFactorGraph {
   void print(string s = "") const;
   bool equals(const gtsam::DiscreteFactorGraph& fg, double tol = 1e-9) const;
 
-  gtsam::DecisionTreeFactor product() const;
+  gtsam::DiscreteFactor* product() const;
   double operator()(const gtsam::DiscreteValues& values) const;
   gtsam::DiscreteValues optimize() const;
 
diff --git a/wrap/gtwrap/xml_parser/xml_parser.py b/wrap/gtwrap/xml_parser/xml_parser.py
index 9b3d4d804..9920027ac 100644
--- a/wrap/gtwrap/xml_parser/xml_parser.py
+++ b/wrap/gtwrap/xml_parser/xml_parser.py
@@ -54,7 +54,7 @@ class XMLDocParser:
 
         # Find which member to get docs from, if there are multiple that match in name and args
         documenting_index = self.determine_documenting_index(
-            cpp_class, cpp_method, method_args_names)
+            cpp_class, cpp_method, method_args_names, member_defs)
 
         # Extract the docs for the function that matches cpp_class.cpp_method(*method_args_names).
         return self.get_formatted_docstring(member_defs[documenting_index],