diff --git a/Common/Options.cpp b/Common/Options.cpp
index 8d110b0d497f50d384ecdb39b2d25e23175db36f..6743d66f3627995123fdf74b0820b6855c2bb013 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -798,6 +798,7 @@ void PrintOptionsDoc()
   fprintf(file, "@end ftable\n");
   fclose(file);
 
+#if !defined(HAVE_NO_MESH)
   file = fopen("opt_fields.texi", "w");
   if(!file) {
     Msg::Error("Unable to open file 'opt_fields.texi'");
@@ -828,6 +829,7 @@ void PrintOptionsDoc()
   }
   fprintf(file, "@end ftable\n");
   fclose(file);
+#endif
   
 #endif
 }
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index e52b7fb9a4b4fdd54d9cce25040a629e35d8842c..4677c1a4e0dc16ea116bbc944227636504d41d4d 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -508,10 +508,10 @@ GFaceCompound::GFaceCompound(GModel *m, int tag, std::list<GFace*> &compound,
 {
 
   if (!_lsys) {
-#if defined(HAVE_PETSC)
-    _lsys = new linearSystemPETSc<double>;
-#elif defined(HAVE_TAUCS)
+#if defined(HAVE_TAUCS)
     _lsys = new linearSystemCSRTaucs<double>;
+#elif defined(HAVE_PETSC)
+    _lsys = new linearSystemPETSc<double>;
 #elif defined(HAVE_GMM)
     linearSystemGmm<double> *_lsysb = new linearSystemGmm<double>;
     _lsysb->setGmres(1);