diff --git a/gtsam_unstable/nonlinear/expressions.h b/gtsam_unstable/nonlinear/expressions.h
index 5ac229b7a..960371ed2 100644
--- a/gtsam_unstable/nonlinear/expressions.h
+++ b/gtsam_unstable/nonlinear/expressions.h
@@ -19,8 +19,8 @@ namespace gtsam {
 
   Pose2_ between(const Pose2_& x, const Pose2_& p) {
     Pose2(Pose2::*transform)(const Pose2& p,
-      boost::optional<Matrix3&> H1,
-      boost::optional<Matrix3&> H2) const = &Pose2::between;
+      OptionalJacobian<3, 3> H1,
+      OptionalJacobian<3, 3> H2) const = &Pose2::between;
 
     return Pose2_(x, transform, p);
   }
diff --git a/gtsam_unstable/slam/expressions.h b/gtsam_unstable/slam/expressions.h
index ed53d7465..a45e8f1b4 100644
--- a/gtsam_unstable/slam/expressions.h
+++ b/gtsam_unstable/slam/expressions.h
@@ -60,8 +60,8 @@ Point2_ project3(const Pose3_& x, const Point3_& p, const Cal3_S2_& K) {
 template<class CAL>
 Point2_ uncalibrate(const Expression<CAL>& K, const Point2_& xy_hat) {
   Point2(CAL::*uncal)(const Point2& p,
-    boost::optional<Matrix25&> Dpose,
-    boost::optional<Matrix2&> Dpoint) const = &CAL::uncalibrate;
+    OptionalJacobian<2, 5> Dpose,
+    OptionalJacobian<2, 2> Dpoint) const = &CAL::uncalibrate;
 
   return Point2_(K, uncal, xy_hat);
 }