diff --git a/vcg/complex/trimesh/autoalign_4pcs.h b/vcg/complex/trimesh/autoalign_4pcs.h
index ae2873ac..fac74aec 100644
--- a/vcg/complex/trimesh/autoalign_4pcs.h
+++ b/vcg/complex/trimesh/autoalign_4pcs.h
@@ -59,11 +59,9 @@ class FourPCS {
 public:
 	/* mesh only for using spatial indexing functions (to remove) */
   class PVertex;    // dummy prototype never used
-  class PEdge;    // dummy prototype never used
   class PFace;
 
   class PUsedTypes: public vcg::UsedTypes < vcg::Use<PVertex>::template AsVertexType,
-                                            vcg::Use<PEdge  >::template AsEdgeType,
                                             vcg::Use<PFace  >::template AsFaceType >{};
 
 
diff --git a/vcg/complex/trimesh/crease_cut.h b/vcg/complex/trimesh/crease_cut.h
index 19bcfaf7..0132bd8d 100644
--- a/vcg/complex/trimesh/crease_cut.h
+++ b/vcg/complex/trimesh/crease_cut.h
@@ -134,7 +134,7 @@ void CreaseCut(MESH_TYPE &m, float angleRad)
 			if(curVertexInd < startVn) assert(size_t(curVertexInd) == vertInd); 
 			if(curVertexInd >= startVn)
 				{
-				  m.vert[curVertexInd].ImportLocal(*((*fi).V(j)));
+					m.vert[curVertexInd].ImportData(*((*fi).V(j)));
 					(*fi).V(j) = & m.vert[curVertexInd];
 				}
 		}		
@@ -192,7 +192,7 @@ void CreaseCut(MESH_TYPE &m, float angleRad)
 			if(curVertexInd < startVn) assert(curVertexInd == vertInd); 
 			if(curVertexInd >= startVn)
 			{
-				//m.vert[curVertexInd].ImportLocal(*((*fi).V(j)));
+				//m.vert[curVertexInd].ImportData(*((*fi).V(j)));
 				tri::Append<CMeshO,CMeshO>::ImportVertex(m.vert[curVertexInd],*((*fi).V(j)));
 				(*fi).V(j) = & m.vert[curVertexInd];
 			}
diff --git a/vcg/complex/trimesh/subset.h b/vcg/complex/trimesh/subset.h
index abf3d98e..e43aa0a3 100644
--- a/vcg/complex/trimesh/subset.h
+++ b/vcg/complex/trimesh/subset.h
@@ -81,17 +81,17 @@ struct InsertedV
   FacePointer f;
   int z;
   
-  const bool operator < (const InsertedV & o) const
+  bool operator < (const InsertedV & o) const
   {
     return (v<o.v);
   }
   
-  const bool operator ==(const InsertedV & o)
+  bool operator ==(const InsertedV & o)
   {
     return (v==o.v);
   }
   
-  const bool operator !=(const InsertedV & o)
+  bool operator !=(const InsertedV & o)
   {
     return (v!=o.v);
   }
@@ -118,7 +118,7 @@ void SubSet(S_MESH_TYPE & m, STL_CONT & subSet)
   for(pfi=subSet.begin(); pfi!=subSet.end(); ++pfi)
   {		
 		assert(!(*pfi)->IsD());
-		(*fi).ImportLocal(**pfi);
+		(*fi).ImportData(**pfi);
 		for(int ii = 0 ; ii < (*fi).VN(); ++ii)
 			(*fi).V(ii) = (S_VertexType*)(void*)(*pfi)->V(ii);
 		++fi;
@@ -147,7 +147,7 @@ void SubSet(S_MESH_TYPE & m, STL_CONT & subSet)
 	
 	vi = vcg::tri::Allocator<S_MESH_TYPE>::AddVertices(m,newE-newVertices.begin());
 	for(curr=newVertices.begin(); curr!=newE; ++curr,++vi)
-		(*vi).ImportLocal(*((*curr).v));
+		(*vi).ImportData(*((*curr).v));
 
 	for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi)
 		redirect.push_back(&(*vi));