diff --git a/configure.ac b/configure.ac
index 38b99e39b0383ef0ef50198de16cd61f3aa80ed6..4b6308e96b81bbfd0a9256bb4914f1356fbfa6f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -825,5 +825,8 @@ AC_MSG_RESULT([
    Debugging checks   : $enable_debugging_checks
 ])
 
+# Make sure the latest git revision string gets included
+touch src/version.c
+
 # Generate output.
 AC_OUTPUT
diff --git a/examples/main.c b/examples/main.c
index 11163b42523fa5b1de1438ad8e67dde0fe9c88ef..50f444e692c8ee9cfd3453cd7b3c9b1e4749a2d3 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -296,7 +296,8 @@ int main(int argc, char *argv[]) {
   /* Do we choke on FP-exceptions ? */
   if (with_fp_exceptions) {
     feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-    if (myrank == 0) message("Floating point exceptions will be reported.");
+    if (myrank == 0)
+      message("WARNING: Floating point exceptions will be reported.");
   }
 
   /* How large are the parts? */
diff --git a/src/runner.c b/src/runner.c
index d3b067f177a4f1eef4a070d926f93ba85db15b74..74c9fd034ebd3f5e0c1991e98bb711c99d86a3cd 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1049,6 +1049,8 @@ void runner_do_kick2(struct runner *r, struct cell *c, int timer) {
  */
 void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
 
+#ifdef WITH_MPI
+
   const struct part *restrict parts = c->parts;
   const struct gpart *restrict gparts = c->gparts;
   const size_t nr_parts = c->count;
@@ -1102,6 +1104,10 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
   c->h_max = h_max;
 
   if (timer) TIMER_TOC(timer_dorecv_cell);
+
+#else
+  error("SWIFT was not compiled with MPI support.");
+#endif
 }
 
 /**