diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp
index d86af0b14..30e28e211 100644
--- a/contrib/extractor/System.cpp
+++ b/contrib/extractor/System.cpp
@@ -31,6 +31,7 @@ map_id * map_ids;
 uint16 * areas;
 char output_path[128]=".";
 char input_path[128]=".";
+uint32 maxAreaId = 0;
 
 enum Extract
 {
@@ -146,6 +147,8 @@ void ReadAreaTableDBC()
     for(unsigned int x=0; x<area_count;++x)
         areas[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
 
+    maxAreaId = dbc.getMaxId();
+
     printf("Done! (%u areas loaded)\n", area_count);
 }
 
diff --git a/contrib/extractor/VC71_ad.vcproj b/contrib/extractor/VC71_ad.vcproj
index 2bd27e526..fd2d16120 100644
--- a/contrib/extractor/VC71_ad.vcproj
+++ b/contrib/extractor/VC71_ad.vcproj
@@ -76,7 +76,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="ad debug.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="./debug/"
 				IgnoreDefaultLibraryNames="LIBCD.lib"
@@ -171,7 +171,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="./ad.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="./release/"
 				IgnoreDefaultLibraryNames="LIBC.lib"
diff --git a/contrib/extractor/VC80_ad.vcproj b/contrib/extractor/VC80_ad.vcproj
index 30657907f..fedab5b89 100644
--- a/contrib/extractor/VC80_ad.vcproj
+++ b/contrib/extractor/VC80_ad.vcproj
@@ -79,7 +79,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="ad debug.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="./debug"
 				IgnoreDefaultLibraryNames="LIBCD.lib"
@@ -176,7 +176,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="./ad.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="./release"
 				IgnoreDefaultLibraryNames="LIBC.lib"
diff --git a/contrib/extractor/VC90_ad.vcproj b/contrib/extractor/VC90_ad.vcproj
index 14aa824a0..59fdf6d21 100644
--- a/contrib/extractor/VC90_ad.vcproj
+++ b/contrib/extractor/VC90_ad.vcproj
@@ -80,7 +80,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="ad debug.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="./debug/"
 				IgnoreDefaultLibraryNames="LIBCD.lib"
@@ -175,7 +175,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="./ad.exe"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="./release/"
 				IgnoreDefaultLibraryNames="LIBC.lib"
diff --git a/contrib/extractor/ad.exe b/contrib/extractor/ad.exe
index 5d8e52326..ad4c2f80c 100755
Binary files a/contrib/extractor/ad.exe and b/contrib/extractor/ad.exe differ
diff --git a/contrib/extractor/adt.cpp b/contrib/extractor/adt.cpp
index a42141210..af5a671c6 100644
--- a/contrib/extractor/adt.cpp
+++ b/contrib/extractor/adt.cpp
@@ -17,7 +17,9 @@
 
 //#include <windows.h>
 unsigned int iRes=256;
-extern uint16*areas;
+extern uint16 *areas;
+
+extern uint32 maxAreaId;
 
 vec wmoc;
 
@@ -409,7 +411,7 @@ bool ConvertADT(char * filename,char * filename2)
     {
         for(unsigned int y=0;y<16;y++)
         {
-            if(mcells->ch[y][x].area_id && mcells->ch[y][x].area_id < 0x102D)
+            if(mcells->ch[y][x].area_id && mcells->ch[y][x].area_id <= maxAreaId)
             {
                 if(areas[mcells->ch[y][x].area_id]==0xffff)
                     printf("\nCan't find area flag for areaid %u.\n",mcells->ch[y][x].area_id);
diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h
index 0942c5c31..ced42871b 100644
--- a/src/game/GridDefines.h
+++ b/src/game/GridDefines.h
@@ -41,10 +41,10 @@ class Player;
 #define MIN_GRID_DELAY          MINUTE*1000
 #define MIN_MAP_UPDATE_DELAY    50
 
-#define MAX_NUMBER_OF_CELLS     8
+#define MAX_NUMBER_OF_CELLS     4
 #define SIZE_OF_GRID_CELL       (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS)
 
-#define CENTER_GRID_CELL_ID     256
+#define CENTER_GRID_CELL_ID     128
 #define CENTER_GRID_CELL_OFFSET (SIZE_OF_GRID_CELL/2)
 
 #define TOTAL_NUMBER_OF_CELLS_PER_MAP    (MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_CELLS)