diff --git a/gtsam/geometry/EssentialMatrix.h b/gtsam/geometry/EssentialMatrix.h
index adde77511..74a1cd798 100644
--- a/gtsam/geometry/EssentialMatrix.h
+++ b/gtsam/geometry/EssentialMatrix.h
@@ -20,7 +20,7 @@ namespace gtsam {
  * but here we choose instead to parameterize it as a (Rot3,Unit3) pair.
  * We can then non-linearly optimize immediately on this 5-dimensional manifold.
  */
-class EssentialMatrix: public DerivedValue<EssentialMatrix> {
+class GTSAM_EXPORT EssentialMatrix: public DerivedValue<EssentialMatrix> {
 
 private:
 
diff --git a/gtsam/geometry/Unit3.h b/gtsam/geometry/Unit3.h
index 8eac7f1a8..39e2c9799 100644
--- a/gtsam/geometry/Unit3.h
+++ b/gtsam/geometry/Unit3.h
@@ -27,7 +27,7 @@
 namespace gtsam {
 
 /// Represents a 3D point on a unit sphere.
-class Unit3: public DerivedValue<Unit3> {
+class GTSAM_EXPORT Unit3: public DerivedValue<Unit3> {
 
 private:
 
diff --git a/gtsam/geometry/tests/testPoint3.cpp b/gtsam/geometry/tests/testPoint3.cpp
index ab0d12b9e..65c610c25 100644
--- a/gtsam/geometry/tests/testPoint3.cpp
+++ b/gtsam/geometry/tests/testPoint3.cpp
@@ -81,7 +81,7 @@ TEST( Point3, stream) {
 TEST (Point3, normalize) {
   Matrix actualH;
   Point3 point(1, -2, 3); // arbitrary point
-  Point3 expected(point / sqrt(14));
+  Point3 expected(point / sqrt(14.0));
   EXPECT(assert_equal(expected, point.normalize(actualH), 1e-8));
   Matrix expectedH = numericalDerivative11<Point3, Point3>(
       boost::bind(&Point3::normalize, _1, boost::none), point);
diff --git a/gtsam/geometry/tests/testSphere2.cpp b/gtsam/geometry/tests/testSphere2.cpp
index 2725df061..3009d5d0d 100644
--- a/gtsam/geometry/tests/testSphere2.cpp
+++ b/gtsam/geometry/tests/testSphere2.cpp
@@ -43,7 +43,7 @@ Point3 point3_(const Unit3& p) {
 TEST(Unit3, point3) {
   vector<Point3> ps;
   ps += Point3(1, 0, 0), Point3(0, 1, 0), Point3(0, 0, 1), Point3(1, 1, 0)
-      / sqrt(2);
+      / sqrt(2.0);
   Matrix actualH, expectedH;
   BOOST_FOREACH(Point3 p,ps) {
     Unit3 s(p);
diff --git a/gtsam/navigation/tests/testGeographicLib.cpp b/gtsam/navigation/tests/testGeographicLib.cpp
index 44964c569..aaa01b54d 100644
--- a/gtsam/navigation/tests/testGeographicLib.cpp
+++ b/gtsam/navigation/tests/testGeographicLib.cpp
@@ -19,6 +19,7 @@
 #include <GeographicLib/UTMUPS.hpp>
 #include <GeographicLib/LocalCartesian.hpp>
 
+#include <gtsam/base/types.h>
 #include <CppUnitLite/TestHarness.h>
 
 #include <iostream>
diff --git a/gtsam/slam/EssentialMatrixConstraint.h b/gtsam/slam/EssentialMatrixConstraint.h
index f2eb76e2d..0e4fb48cf 100644
--- a/gtsam/slam/EssentialMatrixConstraint.h
+++ b/gtsam/slam/EssentialMatrixConstraint.h
@@ -27,7 +27,7 @@ namespace gtsam {
  * Binary factor between two Pose3 variables induced by an EssentialMatrix measurement
  * @addtogroup SLAM
  */
-class EssentialMatrixConstraint: public NoiseModelFactor2<Pose3, Pose3> {
+class GTSAM_EXPORT EssentialMatrixConstraint: public NoiseModelFactor2<Pose3, Pose3> {
 
 private: