diff --git a/configure.ac b/configure.ac
index c715fb34baeb469e87977da779d82f48f564999e..9751d503c3b7b29180adc82114416e6a13a7759e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,6 +225,8 @@ if test "x$enable_debug" = "xyes"; then
    fi
 fi
 
+
+
 # Check if stand-alone FoF is on.
 AC_ARG_ENABLE([stand-alone-fof],
    [AS_HELP_STRING([--enable-stand-alone-fof],
@@ -233,7 +235,7 @@ AC_ARG_ENABLE([stand-alone-fof],
    [enable_standalone_fof="$enableval"],
    [enable_standalone_fof="no"]
 )
-AM_CONDITIONAL([HAVEFOF],[test $enable_standalone_fof = "yes"])
+AM_CONDITIONAL([HAVESTANDALONEFOF],[test $enable_standalone_fof = "yes"])
 
 # Check if task debugging is on.
 AC_ARG_ENABLE([task-debugging],
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ba92dd4cd4c2b1a4852714edc1e6c4aadd8b6c32..d8161ec28ec4b6ffc14ce0b0f9861c1b8fde2ce2 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -37,14 +37,14 @@ MPI_FLAGS = -DWITH_MPI $(PARMETIS_INCS) $(METIS_INCS)
 bin_PROGRAMS = swift
 
 # Also build the FOF tool?
-if HAVEFOF
+if HAVESTANDALONEFOF
 bin_PROGRAMS += fof
 endif
 
 # Build MPI versions as well?
 if HAVEMPI
 bin_PROGRAMS += swift_mpi
-if HAVEFOF
+if HAVESTANDALONEFOF
 bin_PROGRAMS += fof_mpi
 endif
 endif
diff --git a/src/fof_io.h b/src/fof_io.h
index b598b432e68ced17bed6d42f79c58af562d33ff5..e6e91c577ad2676cc9bb2d731b2250c9c05cafd4 100644
--- a/src/fof_io.h
+++ b/src/fof_io.h
@@ -49,7 +49,7 @@ INLINE static void convert_bpart_group_id(const struct engine* e,
  * @brief Specifies which FoF-related particle fields to write to a dataset
  *
  * @param parts The particle array.
- * @param parts The extended particle array.
+ * @param xparts The extended particle array.
  * @param list The list of i/o properties to write.
  *
  * @return The number of fields to write.