diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8c3c86f2e..b00550a9b 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6835"
+ #define REVISION_NR "6836"
 #endif // __REVISION_NR_H__
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 37fcfc736..ecbb21223 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -125,7 +125,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/MP /bigobj"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/MP /bigobj"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
@@ -1311,11 +1311,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapRefManager.h"
+				RelativePath="..\..\src\game\MapReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapReference.h"
+				RelativePath="..\..\src\game\MapRefManager.h"
 				>
 			</File>
 			<File
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 20e2a8cbc..e71626424 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -6,6 +6,7 @@
 	ProjectGUID="{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
 	RootNamespace="game"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -125,7 +126,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/MP /bigobj"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
@@ -286,7 +287,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/MP /bigobj"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
@@ -1312,11 +1313,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapRefManager.h"
+				RelativePath="..\..\src\game\MapReference.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\MapReference.h"
+				RelativePath="..\..\src\game\MapRefManager.h"
 				>
 			</File>
 			<File