diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 231b7ec186dac9c3a562cdf80f4ac068a5b1e6b1..043e0253a9264c45c5c9d4ecd864c6f683114281 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -165,7 +165,7 @@ void CreateOutputFile(const char *filename, int format)
 
   case FORMAT_BDF:
     GModel::current()->writeBDF(name, CTX.mesh.bdf_field_format, 
-                     CTX.mesh.save_all, CTX.mesh.scaling_factor);
+				CTX.mesh.save_all, CTX.mesh.scaling_factor);
     break;
 
   case FORMAT_P3D:
diff --git a/Geo/CGNSOptions.h b/Geo/CGNSOptions.h
index aeb79f4e7b522408714befdada75838091d12eda..fe32ec018ca6dac92928cef22947eefc69254981 100644
--- a/Geo/CGNSOptions.h
+++ b/Geo/CGNSOptions.h
@@ -4,6 +4,7 @@
 // bugs and problems to <gmsh@geuz.org>.
 //
 // CGNSOptions.h - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
+
 #ifndef _CGNSOPTIONS_H_
 #define _CGNSOPTIONS_H_
 
diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index 9405c8153acf567da2cc9a0c0d3e8826434f1a87..2670f8392a176a019728a0d644906dd34be1b758 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/Geo/GModelIO_CGNS.cpp
@@ -7,6 +7,7 @@
 
 #include "GModel.h"
 #include "Message.h"
+#include "CGNSOptions.h"
 
 #if defined(HAVE_LIBCGNS)
 
@@ -31,7 +32,6 @@
 
 #include "MZone.h"
 #include "MZoneBoundary.h"
-#include "CGNSOptions.h"
 
 #include <cgnslib.h>
 
@@ -217,7 +217,7 @@ int GModel::readCGNS(const std::string &name)
  *
  ******************************************************************************/
 
-int GModel::writeCGNS(const std::string &name, int zoneDefinition,
+int GModel::writeCGNS(const std::string &name, const int zoneDefinition,
                       const CGNSOptions &options, double scalingFactor)
 {