diff --git a/Recast/Source/Recast.cpp b/Recast/Source/Recast.cpp
index 7df231f..b76c768 100644
--- a/Recast/Source/Recast.cpp
+++ b/Recast/Source/Recast.cpp
@@ -143,11 +143,12 @@ void rcCalcGridSize(const float* bmin, const float* bmax, float cs, int* w, int*
 	*h = (int)((bmax[2] - bmin[2])/cs+0.5f);
 }
 
-bool rcCreateHeightfield(rcBuildContext* ctx, rcHeightfield& hf, int width, int height,
+bool rcCreateHeightfield(rcBuildContext* /*ctx*/, rcHeightfield& hf, int width, int height,
 						 const float* bmin, const float* bmax,
 						 float cs, float ch)
 {
-	rcAssert(ctx);
+	// TODO: VC complains about unref formal variable, figure out a way to handle this better.
+//	rcAssert(ctx);
 	
 	hf.width = width;
 	hf.height = height;
@@ -171,12 +172,13 @@ static void calcTriNormal(const float* v0, const float* v1, const float* v2, flo
 	rcVnormalize(norm);
 }
 
-void rcMarkWalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAngle,
+void rcMarkWalkableTriangles(rcBuildContext* /*ctx*/, const float walkableSlopeAngle,
 							 const float* verts, int /*nv*/,
 							 const int* tris, int nt,
 							 unsigned char* areas)
 {
-	rcAssert(ctx);
+	// TODO: VC complains about unref formal variable, figure out a way to handle this better.
+//	rcAssert(ctx);
 	
 	const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
 
@@ -192,12 +194,13 @@ void rcMarkWalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAngle
 	}
 }
 
-void rcClearUnwalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAngle,
+void rcClearUnwalkableTriangles(rcBuildContext* /*ctx*/, const float walkableSlopeAngle,
 								const float* verts, int /*nv*/,
 								const int* tris, int nt,
 								unsigned char* areas)
 {
-	rcAssert(ctx);
+	// TODO: VC complains about unref formal variable, figure out a way to handle this better.
+//	rcAssert(ctx);
 	
 	const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
 	
@@ -213,9 +216,10 @@ void rcClearUnwalkableTriangles(rcBuildContext* ctx, const float walkableSlopeAn
 	}
 }
 
-int rcGetHeightFieldSpanCount(rcBuildContext* ctx, rcHeightfield& hf)
+int rcGetHeightFieldSpanCount(rcBuildContext* /*ctx*/, rcHeightfield& hf)
 {
-	rcAssert(ctx);
+	// TODO: VC complains about unref formal variable, figure out a way to handle this better.
+//	rcAssert(ctx);
 	
 	const int w = hf.width;
 	const int h = hf.height;
diff --git a/Recast/Source/RecastRasterization.cpp b/Recast/Source/RecastRasterization.cpp
index 72904e7..89ec9ff 100644
--- a/Recast/Source/RecastRasterization.cpp
+++ b/Recast/Source/RecastRasterization.cpp
@@ -154,11 +154,11 @@ static void addSpan(rcHeightfield& hf, const int x, const int y,
 	}
 }
 
-void rcAddSpan(rcBuildContext* ctx, rcHeightfield& hf, const int x, const int y,
+void rcAddSpan(rcBuildContext* /*ctx*/, rcHeightfield& hf, const int x, const int y,
 			   const unsigned short smin, const unsigned short smax,
 			   const unsigned char area, const int flagMergeThr)
 {
-	rcAssert(ctx);
+//	rcAssert(ctx);
 	addSpan(hf, x,y, smin, smax, area, flagMergeThr);
 }
 
diff --git a/RecastDemo/Bin/Recast.exe b/RecastDemo/Bin/Recast.exe
index 004bf46..d235d50 100644
Binary files a/RecastDemo/Bin/Recast.exe and b/RecastDemo/Bin/Recast.exe differ
diff --git a/RecastDemo/Build/VC9/Recast.vcproj b/RecastDemo/Build/VC9/Recast.vcproj
index 1869aab..b1d0fc4 100644
--- a/RecastDemo/Build/VC9/Recast.vcproj
+++ b/RecastDemo/Build/VC9/Recast.vcproj
@@ -192,11 +192,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Recast\Include\RecastLog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Recast\Include\RecastTimer.h"
+					RelativePath="..\..\..\Recast\Include\RecastAssert.h"
 					>
 				</File>
 			</Filter>
@@ -223,10 +219,6 @@
 					RelativePath="..\..\..\Recast\Source\RecastFilter.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastLog.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\Recast\Source\RecastMesh.cpp"
 					>
@@ -243,10 +235,6 @@
 					RelativePath="..\..\..\Recast\Source\RecastRegion.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastTimer.cpp"
-					>
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -379,6 +367,10 @@
 					RelativePath="..\..\Include\Sample_TileMesh.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\Include\SampleInterfaces.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\Include\SlideShow.h"
 					>
@@ -463,6 +455,10 @@
 					RelativePath="..\..\Source\Sample_TileMesh.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\Source\SampleInterfaces.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\Source\SlideShow.cpp"
 					>