diff --git a/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj b/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj
index bba1a2b31..d1aa5a6c4 100644
--- a/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj
+++ b/src/engine/shared/library/sharedCollision/build/win32/sharedCollision.vcxproj
@@ -211,6 +211,9 @@
     <ClCompile Include="..\..\src\shared\core\CollisionUtils.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
     </ClCompile>
+    <ClCompile Include="..\..\src\shared\core\CollisionVolume.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
+    </ClCompile>
     <ClCompile Include="..\..\src\shared\core\CollisionWorld.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
     </ClCompile>
@@ -247,9 +250,7 @@
     <ClCompile Include="..\..\src\shared\core\Floor.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
     </ClCompile>
-    <ClCompile Include="..\..\src\shared\core\FloorContactShape.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
-    </ClCompile>
+    <ClCompile Include="..\..\src\shared\core\FloorContactShape.cpp" />
     <ClCompile Include="..\..\src\shared\core\FloorLocator.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
     </ClCompile>
@@ -347,6 +348,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\include\public\sharedCollision\FloorContactShape.h" />
     <ClInclude Include="..\..\src\shared\core\BarrierObject.h" />
     <ClInclude Include="..\..\src\shared\core\BaseClass.h" />
     <ClInclude Include="..\..\src\shared\core\BoxTree.h" />
@@ -362,6 +364,7 @@
     <ClInclude Include="..\..\src\shared\core\CollisionResolve.h" />
     <ClInclude Include="..\..\src\shared\core\CollisionSurface.h" />
     <ClInclude Include="..\..\src\shared\core\CollisionUtils.h" />
+    <ClInclude Include="..\..\src\shared\core\CollisionVolume.h" />
     <ClInclude Include="..\..\src\shared\core\CollisionWorld.h" />
     <ClInclude Include="..\..\src\shared\core\ConfigSharedCollision.h" />
     <ClInclude Include="..\..\src\shared\core\Contact3d.h" />
@@ -376,7 +379,6 @@
     <ClInclude Include="..\..\src\shared\core\DoorObject.h" />
     <ClInclude Include="..\..\src\shared\core\FirstSharedCollision.h" />
     <ClInclude Include="..\..\src\shared\core\Floor.h" />
-    <ClInclude Include="..\..\src\shared\core\FloorContactShape.h" />
     <ClInclude Include="..\..\src\shared\core\FloorLocator.h" />
     <ClInclude Include="..\..\src\shared\core\FloorManager.h" />
     <ClInclude Include="..\..\src\shared\core\FloorMesh.h" />
diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp
index c97710ba0..7e4256124 100644
--- a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp
+++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionUtils.cpp
@@ -905,6 +905,10 @@ bool VertexSorterX ( Vector const & A, Vector const & B )
 	return A.x < B.x;
 }
 
+void BuildConvexHull ( VertexList const & verts, VertexList & outPoly )
+{
+}
+
 // ----------------------------------------------------------------------
 // 3-d exit test
 
diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp
new file mode 100644
index 000000000..f8d3ef001
--- /dev/null
+++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.cpp
@@ -0,0 +1,8 @@
+// ======================================================================
+//
+// CollisionVolume.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedCollision/FirstSharedCollision.h"
diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h
new file mode 100644
index 000000000..afb2324ec
--- /dev/null
+++ b/src/engine/shared/library/sharedCollision/src/shared/core/CollisionVolume.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// CollisionVolume.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CollisionVolume_H
+#define INCLUDED_CollisionVolume_H
+
+// ======================================================================
+
+class Vector;
+
+// ======================================================================
+
+class CollisionVolume
+{
+public:
+
+	CollisionVolume();
+	virtual ~CollisionVolume();
+
+	// ----------
+	// Generic interface
+
+	bool	contains	( Vector const & V );
+
+protected:
+
+	// Disable copying
+
+	CollisionVolume(const CollisionVolume &source);
+	CollisionVolume & operator =(const CollisionVolume &source);
+};
+
+// ----------------------------------------------------------------------
+
+#endif
diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/FloorContactShape.cpp b/src/engine/shared/library/sharedCollision/src/shared/core/FloorContactShape.cpp
index 4c639c968..7e908c896 100644
--- a/src/engine/shared/library/sharedCollision/src/shared/core/FloorContactShape.cpp
+++ b/src/engine/shared/library/sharedCollision/src/shared/core/FloorContactShape.cpp
@@ -4,6 +4,6 @@
 // copyright (c) 2001 Sony Online Entertainment
 //
 // ======================================================================
-
+__declspec(dllexport) void getRidOfLNK4221(){}
 #include "sharedCollision/FirstSharedCollision.h"
 #include "sharedCollision/FloorContactShape.h"
diff --git a/src/engine/shared/library/sharedCollision/src/shared/core/Intersect1d.h b/src/engine/shared/library/sharedCollision/src/shared/core/Intersect1d.h
index 626edd9ec..499e34a29 100644
--- a/src/engine/shared/library/sharedCollision/src/shared/core/Intersect1d.h
+++ b/src/engine/shared/library/sharedCollision/src/shared/core/Intersect1d.h
@@ -16,102 +16,98 @@ class Range;
 
 namespace Intersect1d
 {
+	// ----------------------------------------------------------------------
+	// Static intersection
 
-// ----------------------------------------------------------------------
-// Static intersection
-
-inline Range IntersectRanges ( Range const & A, Range const & B )
-{
-	return Range( std::max(A.getMin(),B.getMin()), 
-	              std::min(A.getMax(),B.getMax()) );
-}
-
-inline Range IntersectRanges ( Range const & A, Range const & B, Range const & C )
-{
-	return Range( std::max(std::max(A.getMin(),B.getMin()),C.getMin()),
-	              std::min(std::min(A.getMax(),B.getMax()),C.getMax()) );
-
-}
-
-// ----------------------------------------------------------------------
-// Temporal intersect tests
-
-// A value P is changing with velocity V
-// Find the range of time for which P is less/greater than R
-
-inline Range IntersectFloatLess ( float P, float V, float R )
-{
-	if(V == 0)
+	inline Range IntersectRanges(Range const& A, Range const& B)
 	{
-		if(P < R) return Range::inf;
-		else      return Range::empty;
+		return Range(std::max(A.getMin(), B.getMin()),
+		                std::min(A.getMax(), B.getMax()));
 	}
 
-	float t = (R - P) / V;
-
-	if(V < 0) return Range(t,REAL_MAX);
-	else      return Range(-REAL_MAX,t);
-}
-
-inline Range IntersectFloatGreater ( float P, float V, float R )
-{
-	if(V == 0)
+	inline Range IntersectRanges(Range const& A, Range const& B, Range const& C)
 	{
-		if(P > R) return Range::inf;
-		else      return Range::empty;
+		return Range(std::max(std::max(A.getMin(), B.getMin()), C.getMin()),
+		                std::min(std::min(A.getMax(), B.getMax()), C.getMax()));
 	}
 
-	float t = (R - P) / V;
+	// ----------------------------------------------------------------------
+	// Temporal intersect tests
 
-	if(V > 0) return Range(t,REAL_MAX);
-	else      return Range(-REAL_MAX,t);
-}
+	// A value P is changing with velocity V
+	// Find the range of time for which P is less/greater than R
 
-// ----------
-
-inline Range IntersectFloatFloat ( real A, real V, real B )
-{
-	if(V == 0)
+	inline Range IntersectFloatLess(float P, float V, float R)
 	{
-		if(A == B)	return Range::inf;      //lint !e777 // testing floats for equality
-		else		return Range::empty;
+		if (V == 0)
+		{
+			if (P < R) return Range::inf;
+			else return Range::empty;
+		}
+
+		float t = (R - P) / V;
+
+		if (V < 0) return Range(t, REAL_MAX);
+		else return Range(-REAL_MAX, t);
 	}
 
-	float t = (B - A) / V;
+	inline Range IntersectFloatGreater(float P, float V, float R)
+	{
+		if (V == 0)
+		{
+			if (P > R) return Range::inf;
+			else return Range::empty;
+		}
 
-	return Range(t,t);
-}
+		float t = (R - P) / V;
 
-// A value P is moving with velocity V.
-// Find the range of time for which P overlaps the range R.
+		if (V > 0) return Range(t, REAL_MAX);
+		else return Range(-REAL_MAX, t);
+	}
 
-inline Range IntersectFloatRange ( float A, real V, Range const & R )
-{
-	Range timeMin = IntersectFloatGreater(A,V,R.getMin());
-	Range timeMax = IntersectFloatLess(A,V,R.getMax());
+	// ----------
 
-	return IntersectRanges(timeMin,timeMax);
-}
+	inline Range IntersectFloatFloat(real A, real V, real B)
+	{
+		if (V == 0)
+		{
+			if (A == B) return Range::inf; //lint !e777 // testing floats for equality
+			else return Range::empty;
+		}
 
-inline Range IntersectRangeFloat ( Range const & A, float V, float B )
-{ 
-	return IntersectFloatRange(B,-V,A); 
-}
+		float t = (B - A) / V;
 
-// A range P is moving with velocity V.
-// Find the range of time for which P overlaps the range R.
+		return Range(t, t);
+	}
 
-inline Range IntersectRangeRange ( Range const & A, real V, Range const & B )
-{
-	Range timeMin = IntersectFloatGreater(A.getMax(),V,B.getMin());
-	Range timeMax = IntersectFloatLess(A.getMin(),V,B.getMax());
+	// A value P is moving with velocity V.
+	// Find the range of time for which P overlaps the range R.
 
-	return IntersectRanges(timeMin,timeMax);
-}
+	inline Range IntersectFloatRange(float A, real V, Range const& R)
+	{
+		Range timeMin = IntersectFloatGreater(A, V, R.getMin());
+		Range timeMax = IntersectFloatLess(A, V, R.getMax());
 
-// ----------------------------------------------------------------------
+		return IntersectRanges(timeMin, timeMax);
+	}
 
+	inline Range IntersectRangeFloat(Range const& A, float V, float B)
+	{
+		return IntersectFloatRange(B, -V, A);
+	}
+
+	// A range P is moving with velocity V.
+	// Find the range of time for which P overlaps the range R.
+
+	inline Range IntersectRangeRange(Range const& A, real V, Range const& B)
+	{
+		Range timeMin = IntersectFloatGreater(A.getMax(), V, B.getMin());
+		Range timeMax = IntersectFloatLess(A.getMin(), V, B.getMax());
+
+		return IntersectRanges(timeMin, timeMax);
+	}
+
+	// ----------------------------------------------------------------------
 } // namespace Intersect1d
 
 #endif
-
diff --git a/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp b/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp
index 775afc4fa..74cab07ab 100644
--- a/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp
+++ b/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.cpp
@@ -317,5 +317,4 @@ void DebugMonitor::flushOutput()
 }
 
 // ======================================================================
-
 #endif
diff --git a/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h b/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h
index c6b1d630a..8997470bd 100644
--- a/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h
+++ b/src/engine/shared/library/sharedDebug/src/win32/DebugMonitor.h
@@ -40,7 +40,6 @@ public:
 
 	static void flushOutput();
 };
-
 #endif
 
 // ======================================================================
diff --git a/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp b/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp
index 3f0fe7f6d..172a38c13 100644
--- a/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp
+++ b/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.cpp
@@ -609,5 +609,4 @@ bool AiDebugString::isTextEnabled()
 }
 
 // ======================================================================
-
 #endif // _DEBUG
diff --git a/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h b/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h
index a45d3649e..33631957f 100644
--- a/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h
+++ b/src/engine/shared/library/sharedGame/src/shared/core/AiDebugString.h
@@ -102,6 +102,5 @@ private:
 };
 
 // ======================================================================
-
 #endif // _DEBUG
 #endif // INCLUDED_AiDebugString_H
diff --git a/src/engine/shared/library/sharedGame/src/shared/space/ShipHitEffectsManager.cpp b/src/engine/shared/library/sharedGame/src/shared/space/ShipHitEffectsManager.cpp
index 5e1a439a8..7700796b2 100644
--- a/src/engine/shared/library/sharedGame/src/shared/space/ShipHitEffectsManager.cpp
+++ b/src/engine/shared/library/sharedGame/src/shared/space/ShipHitEffectsManager.cpp
@@ -5,6 +5,7 @@
 //
 //======================================================================
 
+__declspec(dllexport) void getRidOfLNK4221(){}
 #include "sharedGame/FirstSharedGame.h"
 #include "sharedGame/ShipHitEffectsManager.h"
 
diff --git a/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj b/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj
index e5f34646b..a75b141e4 100644
--- a/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj
+++ b/src/engine/shared/library/sharedMath/build/win32/sharedMath.vcxproj
@@ -184,9 +184,7 @@
     <ClCompile Include="..\..\src\shared\core\AxialBox.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
     </ClCompile>
-    <ClCompile Include="..\..\src\shared\core\Capsule.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
-    </ClCompile>
+    <ClCompile Include="..\..\src\shared\core\Capsule.cpp" />
     <ClCompile Include="..\..\src\shared\core\Circle.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Optimized|Win32'">MaxSpeed</Optimization>
     </ClCompile>
@@ -332,11 +330,11 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\include\public\sharedMath\Capsule.h" />
     <ClInclude Include="..\..\src\shared\CatmullRomSpline.h" />
     <ClInclude Include="..\..\src\shared\CompressedQuaternion.h" />
     <ClInclude Include="..\..\src\shared\ConfigSharedMath.h" />
     <ClInclude Include="..\..\src\shared\core\AxialBox.h" />
-    <ClInclude Include="..\..\src\shared\core\Capsule.h" />
     <ClInclude Include="..\..\src\shared\core\Circle.h" />
     <ClInclude Include="..\..\src\shared\core\Cylinder.h" />
     <ClInclude Include="..\..\src\shared\core\Hsv.h" />
diff --git a/src/engine/shared/library/sharedNetwork/src/win32/TcpClient.cpp b/src/engine/shared/library/sharedNetwork/src/win32/TcpClient.cpp
index 22c9d9923..8389546e8 100644
--- a/src/engine/shared/library/sharedNetwork/src/win32/TcpClient.cpp
+++ b/src/engine/shared/library/sharedNetwork/src/win32/TcpClient.cpp
@@ -54,7 +54,7 @@ m_rawTCP( false )
 	if (p)
 	{
 		static int entry = p->p_proto;
-		m_socket = WSASocket (AF_INET, SOCK_STREAM, entry, NULL, 0, WSA_FLAG_OVERLAPPED);
+		m_socket = WSASocketW (AF_INET, SOCK_STREAM, entry, NULL, 0, WSA_FLAG_OVERLAPPED);
 		char optval = 1;
 		setsockopt(m_socket, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
 		setsockopt(m_socket, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(optval));
@@ -91,7 +91,7 @@ m_rawTCP( false )
 	if (p)
 	{
 		static int entry = p->p_proto;
-		m_socket = WSASocket (AF_INET, SOCK_STREAM, entry, NULL, 0, WSA_FLAG_OVERLAPPED);
+		m_socket = WSASocketW (AF_INET, SOCK_STREAM, entry, NULL, 0, WSA_FLAG_OVERLAPPED);
 		if (m_socket != INVALID_SOCKET)
 		{
 			int nameLen = sizeof (struct sockaddr_in);
diff --git a/src/engine/shared/library/sharedNetwork/src/win32/TcpServer.cpp b/src/engine/shared/library/sharedNetwork/src/win32/TcpServer.cpp
index 17a8f5da1..e17fb35e8 100644
--- a/src/engine/shared/library/sharedNetwork/src/win32/TcpServer.cpp
+++ b/src/engine/shared/library/sharedNetwork/src/win32/TcpServer.cpp
@@ -27,7 +27,7 @@ m_service(service)
 	if(p)
 	{
 		static int entry = p->p_proto;
-		m_handle = WSASocket(AF_INET, SOCK_STREAM, entry, NULL, 0, WSA_FLAG_OVERLAPPED);
+		m_handle = WSASocketW(AF_INET, SOCK_STREAM, entry, NULL, 0, WSA_FLAG_OVERLAPPED);
 		if(m_handle != INVALID_SOCKET)
 		{
 			m_localIOCP = CreateIoCompletionPort(reinterpret_cast<HANDLE>(m_handle), 0, 0, 0);
diff --git a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj
index 555b44099..1eb7ac5f7 100644
--- a/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj
+++ b/src/external/3rd/library/dpvs/implementation/msvc8/dpvs.vcxproj
@@ -122,7 +122,7 @@
       <HeaderFileName />
     </Midl>
     <ClCompile>
-      <AdditionalOptions>/QIfdiv- /QI0f-  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\interface;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -172,7 +172,7 @@
       <HeaderFileName />
     </Midl>
     <ClCompile>
-      <AdditionalOptions>/O3 /QIfdiv- /QI0f- -Qunroll0  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/O3 -Qunroll0  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\interface;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -471,4 +471,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/external/3rd/library/dpvs/implementation/sources/dpvsDebug.cpp b/src/external/3rd/library/dpvs/implementation/sources/dpvsDebug.cpp
index 0a3361085..02b196a55 100644
--- a/src/external/3rd/library/dpvs/implementation/sources/dpvsDebug.cpp
+++ b/src/external/3rd/library/dpvs/implementation/sources/dpvsDebug.cpp
@@ -127,7 +127,7 @@ void Debug::print(const char* format, ... )
 
 	va_list		argptr;
 	va_start	(argptr, format);
-	vsprintf	(string, format, argptr);
+	vsprintf_s	(string, format, argptr);
 	va_end		(argptr);
 
 #if defined (DPVS_DEBUG)
diff --git a/src/game/client/application/SwgClient/src/win32/SwgClient.rc b/src/game/client/application/SwgClient/src/win32/SwgClient.rc
index 5da7901c8..710dbcab8 100644
--- a/src/game/client/application/SwgClient/src/win32/SwgClient.rc
+++ b/src/game/client/application/SwgClient/src/win32/SwgClient.rc
@@ -61,8 +61,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1
- PRODUCTVERSION 2,0,0,1
+ FILEVERSION 2,0,0,2
+ PRODUCTVERSION 2,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj
index c0445e3a9..0d87681c6 100644
--- a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj
+++ b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj
@@ -95,7 +95,7 @@
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>wWinMainCRTStartup </EntryPointSymbol>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/SAFESEH:NO /ignore:4254 /ignore:4078 %(AdditionalOptions)</AdditionalOptions>
       <ForceFileOutput>Enabled</ForceFileOutput>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
@@ -150,6 +150,7 @@
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <AdditionalOptions>/SAFESEH:NO /ignore:4254 /ignore:4078 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc
index 3cc3c7f21..c770a6ee9 100644
--- a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc
+++ b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc
@@ -537,8 +537,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1
- PRODUCTVERSION 2,0,0,1
+ FILEVERSION 2,0,0,2
+ PRODUCTVERSION 2,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L