diff --git a/include/mitsuba/render/gkdtree.h b/include/mitsuba/render/gkdtree.h
index 35a0d90f..59a00cd2 100644
--- a/include/mitsuba/render/gkdtree.h
+++ b/include/mitsuba/render/gkdtree.h
@@ -3092,9 +3092,9 @@ template <typename Derived> void GenericKDTree<Derived>::findCosts(
 					nIntersections++;
 				if (i > warmup) {
 					A[idx].x = 1;
-					A[idx].y = boost::get<1>(statistics);
-					A[idx].z = boost::get<2>(statistics);
-					b[idx]   = boost::get<3>(statistics);
+					A[idx].y = (Float) boost::get<1>(statistics);
+					A[idx].z = (Float) boost::get<2>(statistics);
+					b[idx]   = (Float) boost::get<3>(statistics);
 					idx++;
 				}
 			}
diff --git a/include/mitsuba/render/kdtree.h b/include/mitsuba/render/kdtree.h
index 79dab483..065183a5 100644
--- a/include/mitsuba/render/kdtree.h
+++ b/include/mitsuba/render/kdtree.h
@@ -54,7 +54,7 @@ MTS_NAMESPACE_BEGIN
  *
  * \sa GenericKDTree
  */
-class KDTree : public GenericKDTree<KDTree> {
+class MTS_EXPORT_RENDER KDTree : public GenericKDTree<KDTree> {
 	friend class GenericKDTree<KDTree>;
 public:
 	/// Create an empty kd-tree
diff --git a/src/converter/mtsimport.cpp b/src/converter/mtsimport.cpp
index 8d3838e4..f23d9b8f 100644
--- a/src/converter/mtsimport.cpp
+++ b/src/converter/mtsimport.cpp
@@ -32,7 +32,7 @@
 #include <mitsuba/core/plugin.h>
 #include <mitsuba/core/statistics.h>
 #if defined(WIN32)
-#include "../mitsuba/getopt.h"
+#include <mitsuba/core/getopt.h>
 #endif
 
 XERCES_CPP_NAMESPACE_USE