diff --git a/src/mitsuba/mitsuba.cpp b/src/mitsuba/mitsuba.cpp
index a27e48ca..4e60dbc6 100644
--- a/src/mitsuba/mitsuba.cpp
+++ b/src/mitsuba/mitsuba.cpp
@@ -84,6 +84,11 @@ void signalHandler(int signal) {
 		renderQueue->flush();
 	} else if (signal == SIGFPE) {
 		SLog(EWarn, "Caught a floating-point exception!");
+
+		#if defined(MTS_DEBUG_FP)
+		/* Generate a core dump! */
+		abort();
+		#endif
 	}
 }
 #endif
diff --git a/src/volume/gridvolume.cpp b/src/volume/gridvolume.cpp
index 81d47432..65d79506 100644
--- a/src/volume/gridvolume.cpp
+++ b/src/volume/gridvolume.cpp
@@ -26,9 +26,6 @@
 // Uncomment to enable nearest-neighbor direction interpolation
 //#define VINTERP_NEAREST_NEIGHBOR
 
-// Uncomment to enable structure tensor-based direction interpolation (better, but slow)
-#define VINTERP_STRUCTURE_TENSOR
-
 // Number of power iteration steps used to find the dominant direction
 #define POWER_ITERATION_STEPS 5