diff --git a/python/gtsam/preamble/base.h b/python/gtsam/preamble/base.h
index 626b47ae4..5cf633e65 100644
--- a/python/gtsam/preamble/base.h
+++ b/python/gtsam/preamble/base.h
@@ -11,6 +11,8 @@
  * mutations on Python side will not be reflected on C++.
  */
 
-PYBIND11_MAKE_OPAQUE(std::vector<gtsam::IndexPair>);
+PYBIND11_MAKE_OPAQUE(gtsam::IndexPairVector);
+
+PYBIND11_MAKE_OPAQUE(gtsam::IndexPairSet);
 
 PYBIND11_MAKE_OPAQUE(std::vector<gtsam::Matrix>);  // JacobianVector
diff --git a/python/gtsam/preamble/discrete.h b/python/gtsam/preamble/discrete.h
index 608508c32..320e0ac71 100644
--- a/python/gtsam/preamble/discrete.h
+++ b/python/gtsam/preamble/discrete.h
@@ -13,4 +13,3 @@
 
 #include <pybind11/stl.h>
 
-PYBIND11_MAKE_OPAQUE(gtsam::DiscreteKeys);
diff --git a/python/gtsam/preamble/hybrid.h b/python/gtsam/preamble/hybrid.h
index 56a07cfdd..5e5a71e48 100644
--- a/python/gtsam/preamble/hybrid.h
+++ b/python/gtsam/preamble/hybrid.h
@@ -11,4 +11,4 @@
  * mutations on Python side will not be reflected on C++.
  */
 
-#include <pybind11/stl.h>
+PYBIND11_MAKE_OPAQUE(std::vector<gtsam::GaussianFactor::shared_ptr>);
diff --git a/python/gtsam/preamble/inference.h b/python/gtsam/preamble/inference.h
index 4106c794a..d07a75f6f 100644
--- a/python/gtsam/preamble/inference.h
+++ b/python/gtsam/preamble/inference.h
@@ -10,5 +10,3 @@
  * Without this they will be automatically converted to a Python object, and all
  * mutations on Python side will not be reflected on C++.
  */
-
-#include <pybind11/stl.h>
\ No newline at end of file
diff --git a/python/gtsam/specializations/inference.h b/python/gtsam/specializations/inference.h
index 22fe3beff..9e23444ea 100644
--- a/python/gtsam/specializations/inference.h
+++ b/python/gtsam/specializations/inference.h
@@ -11,3 +11,4 @@
  * and saves one copy operation.
  */
 
+py::bind_map<std::map<char, double>>(m_, "__MapCharDouble");