diff --git a/RecastDemo/Bin/Recast.exe b/RecastDemo/Bin/Recast.exe
index 5d80a3a6..245d0e88 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 5d6cde9b..1ff4264b 100644
--- a/RecastDemo/Build/VC9/Recast.vcproj
+++ b/RecastDemo/Build/VC9/Recast.vcproj
@@ -284,6 +284,10 @@
 		<Filter
 			Name="Demo"
 			>
+			<File
+				RelativePath="..\..\Source\InputGeom.cpp"
+				>
+			</File>
 			<Filter
 				Name="Include"
 				>
@@ -304,11 +308,15 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\Include\Sample.h"
+					RelativePath="..\..\Include\NavMeshTesterTool.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\Include\Sample_SoloMesh.h"
+					RelativePath="..\..\Include\OffMeshConnectionTool.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Include\Sample.h"
 					>
 				</File>
 				<File
@@ -343,6 +351,10 @@
 					RelativePath="..\..\Source\imguiRenderGL.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\Include\InputGeom.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\Source\main.cpp"
 					>
@@ -352,11 +364,15 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\Source\Sample.cpp"
+					RelativePath="..\..\Source\NavMeshTesterTool.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\Source\Sample_SoloMesh.cpp"
+					RelativePath="..\..\Source\OffMeshConnectionTool.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Source\Sample.cpp"
 					>
 				</File>
 				<File
diff --git a/RecastDemo/Source/NavMeshTesterTool.cpp b/RecastDemo/Source/NavMeshTesterTool.cpp
index a1c0ab1c..6c7c6dfb 100644
--- a/RecastDemo/Source/NavMeshTesterTool.cpp
+++ b/RecastDemo/Source/NavMeshTesterTool.cpp
@@ -129,12 +129,12 @@ void NavMeshTesterTool::handleMenu()
 
 	imguiLabel("Include Flags");
 
-	if (imguiCheck("Ground", m_filter.includeFlags & DT_POLY_GROUND))
+	if (imguiCheck("Ground", (m_filter.includeFlags & DT_POLY_GROUND) ? true : false))
 	{
 		m_filter.includeFlags ^= DT_POLY_GROUND;
 		recalc();
 	}
-	if (imguiCheck("Off-Mesh Connections", m_filter.includeFlags & DT_POLY_OFFMESH_CONNECTION))
+	if (imguiCheck("Off-Mesh Connections", (m_filter.includeFlags & DT_POLY_OFFMESH_CONNECTION) ? true : false))
 	{
 		m_filter.includeFlags ^= DT_POLY_OFFMESH_CONNECTION;
 		recalc();
@@ -142,12 +142,12 @@ void NavMeshTesterTool::handleMenu()
 
 	imguiLabel("Exclude Flags");
 	
-	if (imguiCheck("Ground", m_filter.excludeFlags & DT_POLY_GROUND))
+	if (imguiCheck("Ground", (m_filter.excludeFlags & DT_POLY_GROUND) ? true : false))
 	{
 		m_filter.excludeFlags ^= DT_POLY_GROUND;
 		recalc();
 	}
-	if (imguiCheck("Off-Mesh Connections", m_filter.excludeFlags & DT_POLY_OFFMESH_CONNECTION))
+	if (imguiCheck("Off-Mesh Connections", (m_filter.excludeFlags & DT_POLY_OFFMESH_CONNECTION) ? true : false))
 	{
 		m_filter.excludeFlags ^= DT_POLY_OFFMESH_CONNECTION;
 		recalc();
@@ -287,8 +287,8 @@ void NavMeshTesterTool::recalc()
 										polys, npolys, steerPos, steerPosFlag, steerPosRef))
 						break;
 					
-					bool endOfPath = steerPosFlag & DT_STRAIGHTPATH_END;
-					bool offMeshConnection = steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION;
+					bool endOfPath = (steerPosFlag & DT_STRAIGHTPATH_END) ? true : false;
+					bool offMeshConnection = (steerPosFlag & DT_STRAIGHTPATH_OFFMESH_CONNECTION) ? true : false;
 					
 					// Find movement delta.
 					float delta[3], len;