diff --git a/Utils/Libs/GinLib/gintex.h b/Utils/Libs/GinLib/gintex.h
index 7e33eea39..ecf21b856 100644
--- a/Utils/Libs/GinLib/gintex.h
+++ b/Utils/Libs/GinLib/gintex.h
@@ -269,13 +269,13 @@ BOOL	operator==(sUV const &v1)
 		{
 		return(u==v1.u && v==v1.v);
 		}
-/*
-void	operator=(sUV &Src)	
+
+inline	operator=(sUV const &Src)	
 {
 		u=Src.u;
 		v=Src.v;
 }
-*/
+
 };
 
 struct sUVTri
@@ -289,17 +289,15 @@ BOOL	operator==(sUVTri const &v1)
 		}
 		return (TRUE);
 		}
-/*
-inline void	operator=(sUVTri &Src)	
+
+inline operator=(sUVTri const &Src)	
 {
 		for (int i=0; i<3; i++) 
 		{
-			//p[i]=Src.p[i];
-			p[i].u=Src.p[i].u;
-			p[i].v=Src.p[i].v;
+			p[i]=Src.p[i];
 		}
 }
-*/
+
 };
 
 class CUVtri: public GinChunk
diff --git a/Utils/Libs/TexGrab/AllFiles.cpp b/Utils/Libs/TexGrab/AllFiles.cpp
index 831bebe06..16a3b4d3c 100644
--- a/Utils/Libs/TexGrab/AllFiles.cpp
+++ b/Utils/Libs/TexGrab/AllFiles.cpp
@@ -34,9 +34,11 @@
 				properties that the AllFiles object has.
 	Params:		Name of file to add
   ---------------------------------------------------------------------- */
-void AllFiles::AddFile(const char * Name)
+int	AllFiles::AddFile(const char * Name)
 {
+int	ListSize=AllFileInfos.size();
 	DoCycle(Name,RecurseFiles);
+	return(ListSize);
 }
 
 /*----------------------------------------------------------------------
@@ -118,7 +120,7 @@ void AllFiles::FileCallback(char const * FName,int FileNum)
 		}
 }
 
-void AllFiles::AddMemFrame(char const * FName,Frame &Frame)
+int	AllFiles::AddMemFrame(char const * FName,Frame &Frame)
 {
 	FileInfo	MyInfo;
 	bool		ThisZeroColZero;
@@ -148,10 +150,10 @@ void AllFiles::AddMemFrame(char const * FName,Frame &Frame)
 
 		if (ForceOffsets)
 			MyInfo.SetForceOffsets(XOff,YOff);
-		
-		AllFileInfos.resize(AllFileInfos.size()+1);
-		AllFileInfos[AllFileInfos.size()-1]=MyInfo;
-
+int	ListSize=AllFileInfos.size();
+		AllFileInfos.resize(ListSize+1);
+		AllFileInfos[ListSize]=MyInfo;
+	return(ListSize);
 }
 
 /*----------------------------------------------------------------------
diff --git a/Utils/Libs/TexGrab/AllFiles.h b/Utils/Libs/TexGrab/AllFiles.h
index ce739ce5b..7eb790bdc 100644
--- a/Utils/Libs/TexGrab/AllFiles.h
+++ b/Utils/Libs/TexGrab/AllFiles.h
@@ -76,8 +76,8 @@ public:
 	void setNoSort(void)							{m_noSort=true;}
 
 	void	SortOrder();
-	void	AddFile(const char * Name);
-	void	AddMemFrame(char const * FName,Frame &Frame);
+	int		AddFile(const char * Name);
+	int		AddMemFrame(char const * FName,Frame &Frame);
 	void	ReadRepFile(char const * Name);
 
 
diff --git a/Utils/Libs/TexGrab/TexGrab.cpp b/Utils/Libs/TexGrab/TexGrab.cpp
index 391660e3d..0a59e9f0a 100644
--- a/Utils/Libs/TexGrab/TexGrab.cpp
+++ b/Utils/Libs/TexGrab/TexGrab.cpp
@@ -113,13 +113,14 @@ void	CTexGrab::Process()
 	Purpose:	Add bitmaps to file list
 	Params:		Name = Filename
   ---------------------------------------------------------------------- */
-void	CTexGrab::AddFile(const char *Name)
+int		CTexGrab::AddFile(const char *Name)
 {
 GString	UpperName(Name);
 			
 		UpperName.Upper();
 
-		MyFiles.AddFile(UpperName);
+int		Idx=MyFiles.AddFile(UpperName);
+		return(Idx);
 }
 
 /*----------------------------------------------------------------------
@@ -127,13 +128,14 @@ GString	UpperName(Name);
 	Purpose:	
 	Params:		
   ---------------------------------------------------------------------- */
-void	CTexGrab::AddMemFrame(const char *Name,Frame &Frame)
+int		CTexGrab::AddMemFrame(const char *Name,Frame &Frame)
 {
 GString	UpperName(Name);
 			
 		UpperName.Upper();
 
-		MyFiles.AddMemFrame(UpperName,Frame);
+int		Idx=MyFiles.AddMemFrame(UpperName,Frame);
+		return(Idx);
 }
 
 /*
diff --git a/Utils/Libs/TexGrab/TexGrab.h b/Utils/Libs/TexGrab/TexGrab.h
index 6ebb8e346..7c09876c0 100644
--- a/Utils/Libs/TexGrab/TexGrab.h
+++ b/Utils/Libs/TexGrab/TexGrab.h
@@ -55,8 +55,8 @@ public:
 		CTexGrab();
 		~CTexGrab();
 
-		void	AddFile(const char *Name);
-		void	AddMemFrame(const char *Name,Frame &Frame);
+		int		AddFile(const char *Name);
+		int		AddMemFrame(const char *Name,Frame &Frame);
 
 		void	Process();
 
diff --git a/Utils/MapEdit/Export.cpp b/Utils/MapEdit/Export.cpp
index 3d4c6376b..cb879be2f 100644
--- a/Utils/MapEdit/Export.cpp
+++ b/Utils/MapEdit/Export.cpp
@@ -79,11 +79,12 @@ sExpMapElem		BlankElem={0,0,0};
 			{
 				sMapElem		&MapElem=Map.Get(X,Y);
 				sExpMapElem		TileElem;
+				sExpLayerTile	OutElem;
 
 				TileElem.Tile=MapElem.Tile;
 				TileElem.Set=MapElem.Set;
 				TileElem.Flags=MapElem.Flags;
-				sExpLayerTile	OutElem;
+				
 				OutElem.Tile=UsedTileList.Add(TileElem);
 				OutElem.Flags=MapElem.Flags;
 				fwrite(&OutElem,sizeof(sExpLayerTile),1,File);
diff --git a/Utils/MapEdit/ExportHdr.h b/Utils/MapEdit/ExportHdr.h
index 778be4c8f..1bb1b1c3a 100644
--- a/Utils/MapEdit/ExportHdr.h
+++ b/Utils/MapEdit/ExportHdr.h
@@ -73,7 +73,8 @@ struct	sExpMapElem
 
 BOOL	operator==(sExpMapElem const &v1)	// Does Check flags
 		{
-		return(Set==v1.Set && Tile==v1.Tile && Flags==v1.Flags);
+		return(Set==v1.Set && Tile==v1.Tile);
+//		return(Set==v1.Set && Tile==v1.Tile && Flags==v1.Flags);
 		}
 };
 
diff --git a/tools/MapEdit/MapEdit.exe b/tools/MapEdit/MapEdit.exe
index d64cc90d1..e43a8937a 100644
Binary files a/tools/MapEdit/MapEdit.exe and b/tools/MapEdit/MapEdit.exe differ