diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8151df8d5e695a0cffbc4f03e26ccd744ca14788..50377251b0e15ef18136b7d5eedc858e7906b6a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,8 @@ set(GMSH_API
     Geo/Homology.h
   Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h 
     Mesh/meshGFaceDelaunayInsertion.h
-  Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h Solver/crossConfTerm.h Solver/orthogonalTerm.h
+  Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
+    Solver/crossConfTerm.h Solver/orthogonalTerm.h
     Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h 
     Solver/linearSystemFull.h Solver/elasticitySolver.h
   Post/PView.h Post/PViewData.h Plugin/PluginManager.h
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 45bff1cc8633e5c0b6eb06e1120f6c48f2464b0f..62e8e8005d2435652b570600a96f2b8e4246fd5b 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1619,7 +1619,7 @@ void GModel::save(std::string fileName)
   GModel *temp = GModel::current();
   GModel::setCurrent(this);
   int guess = GuessFileFormatFromFileName(fileName);
-  CreateOutputFile (fileName, guess);
+  CreateOutputFile(fileName, guess);
   GModel::setCurrent(temp);
 }
 
diff --git a/Plugin/NearestNeighbor.cpp b/Plugin/NearestNeighbor.cpp
index 78df0fff857841565405bc73f58d7ee398c0c8e2..db789e314dd787123f106e5ddb86d13eb4003b40 100644
--- a/Plugin/NearestNeighbor.cpp
+++ b/Plugin/NearestNeighbor.cpp
@@ -88,6 +88,8 @@ PView *GMSH_NearestNeighborPlugin::execute(PView *v)
   annDeallocPts(zeronodes);
   delete [] index;
   delete [] dist;
+#else
+  Msg::Error("Nearest neighbor computation requires ANN");
 #endif
 
   data1->setName(v1->getData()->getName() + "_NearestNeighbor");