diff --git a/gtsam/base/Manifold.h b/gtsam/base/Manifold.h
index 6746236be..b30edb3df 100644
--- a/gtsam/base/Manifold.h
+++ b/gtsam/base/Manifold.h
@@ -169,7 +169,8 @@ struct FixedDimension {
 };
 
 /// Helper class to construct the product manifold of two other manifolds, M1 and M2
-/// Assumes nothing except manifold structure from M1 and M2
+/// Assumes nothing except manifold structure for M1 and M2, and the existence
+/// of default constructor for those types
 template<typename M1, typename M2>
 class ProductManifold: public std::pair<M1, M2> {
   BOOST_CONCEPT_ASSERT((IsManifold<M1>));
diff --git a/gtsam/nonlinear/Values.h b/gtsam/nonlinear/Values.h
index d3c114657..633e0dd06 100644
--- a/gtsam/nonlinear/Values.h
+++ b/gtsam/nonlinear/Values.h
@@ -32,6 +32,7 @@
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #endif
 #include <boost/bind.hpp>
 #ifdef __GNUC__