diff --git a/Makefile b/Makefile
index 42af23c..36fcad5 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,9 @@ endif
 
 clean:
 	rm -rf $(OBJS)
-	pushd .
+ifeq ($(strip $(HAVEBOXLIB)), yes)
+	oldpath=`pwd`
 	cd plugins/nyx_plugin; make realclean BOXLIB_HOME=$(BOXLIB_HOME)
-	popd
+endif
+	cd $(oldpath)
 	
diff --git a/plugins/output_arepo.cc b/plugins/output_arepo.cc
index 27fe8c4..24422fd 100644
--- a/plugins/output_arepo.cc
+++ b/plugins/output_arepo.cc
@@ -8,7 +8,7 @@
  * Plugin: Dylan Nelson (dnelson@cfa.harvard.edu)
  */
  
-#ifndef HAVEHDF5
+#ifndef HAVE_HDF5
 
 #include "output.hh"