diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 9cc68a765d9fd7d9f1cd1f2321e6719b8e4c3b2b..b12a1dd44653dbe7cdc89fe16f21e9a9542b75ff 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -2708,7 +2708,9 @@ graphicWindow::graphicWindow(bool main, int numTiles) : _autoScrollMessages(true
     win->callback(remove_graphic_window_cb);
   }
 
+#if defined(__APPLE__)
   sysbar = 0;
+#endif
   bar = 0;
   if(main){
 #if defined(__APPLE__)
@@ -3098,7 +3100,11 @@ void graphicWindow::copySelectedMessagesToClipboard()
 
 void graphicWindow::fillRecentHistoryMenu()
 {
-  if(!bar && !sysbar) return;
+#if defined(__APPLE__)
+  if(CTX::instance()->systemMenuBar && !sysbar)
+    return;
+#endif
+
   Fl_Menu_Item *table = bar_table;
 #if defined(__APPLE__)
   if(CTX::instance()->systemMenuBar)
diff --git a/Numeric/BasisFactory.h b/Numeric/BasisFactory.h
index 691a8340d29088da2d715d2a632e642041ce0afa..883c80f2c3d8bcb3dbad80ee7c42c567897e4e6d 100644
--- a/Numeric/BasisFactory.h
+++ b/Numeric/BasisFactory.h
@@ -21,4 +21,4 @@ class BasisFactory
     static const nodalBasis* create(int elementType);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Numeric/pointsGenerators.h b/Numeric/pointsGenerators.h
index fca7e0904805be6a1532a57f44d2a08c641cfc5c..f01d3a283f627a350241658dbcb07bab941104f3 100644
--- a/Numeric/pointsGenerators.h
+++ b/Numeric/pointsGenerators.h
@@ -8,7 +8,7 @@
 
 #include "fullMatrix.h"
 
- /* 
+ /*
   * Functions to generate point distributions on
   * the references elements, for all orders.
   */
@@ -41,4 +41,4 @@ fullMatrix<double> gmshGeneratePointsPrism(int order, bool serendip);
 
 fullMatrix<double> gmshGeneratePointsPyramid(int order, bool serendip);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Numeric/pyramidalBasis.cpp b/Numeric/pyramidalBasis.cpp
index cf84f8832f88de579e8366bc4eb2cd4e7a840fb4..5c0bbe25c0dd3d39386747873fed9ace04263ee8 100644
--- a/Numeric/pyramidalBasis.cpp
+++ b/Numeric/pyramidalBasis.cpp
@@ -35,7 +35,7 @@ void pyramidalBasis::initialize()
   }
   VDM.invert(*VDMinv);
 }
-  
+
 inline void pyramidalBasis::f(double u, double v, double w, double *val) const
 {
   int n = order+1;
@@ -56,5 +56,3 @@ inline void pyramidalBasis::df(double u, double v, double w, double grads[][3])
 {
 
 }
-
-
diff --git a/Numeric/pyramidalBasis.h b/Numeric/pyramidalBasis.h
index 1055d039e8980cf18bdbe424a3468ae763dc031e..2b5b52aa6a6ba49b0f594a08e274a66815bec1eb 100644
--- a/Numeric/pyramidalBasis.h
+++ b/Numeric/pyramidalBasis.h
@@ -19,7 +19,7 @@ class pyramidalBasis: public nodalBasis
 
   // Orthogonal basis for the pyramid
   BergotBasis bergot;
-  
+
  public:
   pyramidalBasis();
 
@@ -30,5 +30,4 @@ class pyramidalBasis: public nodalBasis
 
 };
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/Solver/linearSystemGMM.h b/Solver/linearSystemGMM.h
index cff85caf034eb8b0779fd6bfcfc2abab341ff18a..2c97a23c8423bb34684eba3b1be0758b6cfe8715 100644
--- a/Solver/linearSystemGMM.h
+++ b/Solver/linearSystemGMM.h
@@ -26,7 +26,7 @@ class linearSystemGmm : public linearSystem<scalar> {
   int _noisy, _gmres;
  public:
   linearSystemGmm()
-    : _a(0), _b(0), _x(0), _prec(1.e-8), _noisy(0), _gmres(0) {}
+    : _x(0), _b(0), _a(0), _prec(1.e-8), _noisy(0), _gmres(0) {}
   virtual bool isAllocated() const { return _a != 0; }
   virtual void allocate(int nbRows)
   {