diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 3035e2e1ccba4c68acccd53155d036a26a0f9337..1be61dcd71fd873125ad7d53251993e385ef138c 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -26,8 +26,6 @@
 #include "gl2yuv.h"
 #endif
 
-extern int mpeg_encode_main(int, char**); 
-
 int GuessFileFormatFromFileName(std::string fileName)
 {
   std::string ext = SplitFileName(fileName)[2];
@@ -473,6 +471,7 @@ void CreateOutputFile(std::string fileName, int format)
       }
       fprintf(fp, "END_INPUT\n");
       fclose(fp);
+      extern int mpeg_encode_main(int, char**);
       char *args[] = {(char*)"gmsh", (char*)parFileName.c_str()};
       try{
         mpeg_encode_main(2, args);
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 854874116e948944535f8ab94f462342d4fbb2af..f3159f3a1c5a264adf29738e7f9773cfcd20471d 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1334,7 +1334,7 @@ void deMeshGFace::operator() (GFace *gf)
   gf->meshStatistics.nbTriangle = gf->meshStatistics.nbEdge = 0;
 }
 
-int debugSurface = -100;
+int debugSurface = -1;
 
 void meshGFace::operator() (GFace *gf)
 {
diff --git a/benchmarks/boolean/constraintSurface.lua b/benchmarks/boolean/constraintSurface.lua
index 07504da19f8096960a04db2d9e4cc55ebf49a6c6..85dee40eb7ac9d72466d067663ce2bf46782b3e9 100644
--- a/benchmarks/boolean/constraintSurface.lua
+++ b/benchmarks/boolean/constraintSurface.lua
@@ -29,3 +29,4 @@ e14 = g:addLine (v14,v11);
 
 g:addRuledFaces ({{e7},{e17}})
 g:addFace ({e7,e8},{{0,0,0}})
+g:addFace ({e11,e12,e13,e14})
diff --git a/contrib/mpeg_encode/README.txt b/contrib/mpeg_encode/README.txt
index 199dd797d0332abb10f37fc32c6809990114deaa..6825d58877a0e5651bdc769c5e754b326e1cb8d1 100644
--- a/contrib/mpeg_encode/README.txt
+++ b/contrib/mpeg_encode/README.txt
@@ -1,6 +1,6 @@
 *************************************************************************
 This is a heavily modified version of mpeg_encode, version 1.5b, for
-inclusion in gmsh. The code was made to compile in C++ and modified so
+inclusion in Gmsh. The code was made to compile in C++ and modified so
 that all errors throw exceptions.
 
 FIXME: When used as a subroutine the code clearly leaks memory (see
diff --git a/doc/CREDITS.txt b/doc/CREDITS.txt
index cdaea7208da79af4d0f5cb6620d3793d8f13f6fb..3d30a59d7276e096fe7b554a3e89e05297997940 100644
--- a/doc/CREDITS.txt
+++ b/doc/CREDITS.txt
@@ -87,6 +87,10 @@ subdirectory) written by George Karypis (karypis at cs.umn.edu),
 copyright (C) 1998 Regents of the University of Minnesota: check the
 configuration options.
 
+This version of Gmsh may contain code (in the contrib/mpeg_encode
+subdirectory) copyright (c) 1995 The Regents of the University of
+California: check the configuration options.
+
 This version of Gmsh may contain code (in the
 contrib/NativeFileChooser subdirectory), copyright (C) 2004 Greg
 Ercolano: check the configuration options.