diff --git a/src/engine.c b/src/engine.c
index 93c430d611cf573c643b4cf94325fb97333381a7..0ede028f52848ced65cce0ca3b44cf49fb6fae9d 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2086,7 +2086,7 @@ static inline void engine_make_external_gravity_dependencies(
     struct scheduler *sched, struct task *gravity, struct cell *c) {
 
   /* init --> external gravity --> kick */
-  scheduler_addunlock(sched, c->drift_gpart, gravity);
+  scheduler_addunlock(sched, c->super->drift_gpart, gravity);
   scheduler_addunlock(sched, gravity, c->super->kick2);
 }
 
diff --git a/src/swift.h b/src/swift.h
index 1d1a7c7d04b3662c524504c292aa7d9eee2c3d09..a5556730ae965109385257c0c38bfc34277223d4 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -35,6 +35,7 @@
 #include "engine.h"
 #include "error.h"
 #include "gravity.h"
+#include "gravity_derivatives.h"
 #include "gravity_properties.h"
 #include "hydro.h"
 #include "hydro_properties.h"
diff --git a/tests/testGravityDerivatives.c b/tests/testGravityDerivatives.c
index 0a811cbda491c40f2f1db7bac5b1f3e2f7508b59..ff5c18208efb95740f12ee5cd64c4340751c05fd 100644
--- a/tests/testGravityDerivatives.c
+++ b/tests/testGravityDerivatives.c
@@ -930,9 +930,6 @@ int main() {
   unsigned long long cpufreq = 0;
   clocks_set_cpufreq(cpufreq);
 
-  /* Choke on FP-exceptions */
-  feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-
   /* Relative tolerance */
   const double tol = 1e-4;