diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 33995d971e15cd2e6529c85fef67c3e450b439ec..37187db3b37266d26b5ecf67c2a2a5b87f6aa78d 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,4 +1,4 @@
-// $Id: GModel.cpp,v 1.95 2008-07-08 12:43:25 geuzaine Exp $
+// $Id: GModel.cpp,v 1.96 2008-07-10 14:35:39 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -131,8 +131,10 @@ void GModel::destroyMeshCaches()
 {
   _vertexVectorCache.clear();
   _vertexMapCache.clear();
+#if !defined(HAVE_GMSH_EMBEDDED)
   if(_octree) Octree_Delete(_octree);
   _octree = 0;
+#endif
 }
 
 GRegion *GModel::getRegionByTag(int n) const
diff --git a/Makefile b/Makefile
index 201d3d9648217b4fba31e5027171fc90dd058598..df8242405800fa66882cd62641c17b25c587725d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.493 2008-07-10 13:29:23 geuzaine Exp $
+# $Id: Makefile,v 1.494 2008-07-10 14:35:39 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -102,8 +102,8 @@ uninstall-lib:
 	rm -rf ${libdir}/libGmsh${LIBSUFFIX}${LIBEXT}
 
 embed:
-	@if [ -r ../getdp2/contrib/gmsh/Makefile ]; then \
-          rsync -av ${GMSH_EMBEDDED} ../getdp2/contrib/gmsh;\
+	@if [ -r ../getdp/contrib/gmsh/Makefile ]; then \
+          rsync -av ${GMSH_EMBEDDED} ../getdp/contrib/gmsh;\
         fi
 
 variables: configure
diff --git a/utils/embed/GmshEmbedded.h b/utils/embed/GmshEmbedded.h
index e6b2185192d0b12a00713af2881220ca92b198f2..30801e168187414475869daf7a6bd393e5e4c8f5 100644
--- a/utils/embed/GmshEmbedded.h
+++ b/utils/embed/GmshEmbedded.h
@@ -12,6 +12,7 @@ public:
     hide_unselected = 0;
     geom.tolerance = 1.e-6;
     mesh.reverse_all_normals = 1;
+    mesh.second_order_experimental = 0;
     pick_elements = 0;
   }
   double lc;
@@ -22,6 +23,7 @@ public:
   } geom;
   struct{
     int reverse_all_normals;
+    int second_order_experimental;
   } mesh;
   unsigned int PACK_COLOR(int,int,int,int){ return 0; }
   int UNPACK_RED(unsigned int){ return 0; }