diff --git a/como-tools.jam b/como-tools.jam
index 2f59453b4..2fa5e2aa4 100644
--- a/como-tools.jam
+++ b/como-tools.jam
@@ -15,10 +15,10 @@ if ! $(COMO_PATH_SETUP) # do this once
     COMO_BIN_DIRECTORY ?= "" ; # Don't clobber tool names if COMO_ROOT_DIRECTORY not
                                # set
 
-    COMO_INCLUDE_PATH ?= $(COMO_BASE)$(SLASH)$(DOTDOT)$(SLASH)libcomo ;
+    COMO_INCLUDE_PATH ?= $(COMO_BASE)$(SLASH)libcomo ;
     COMO_INCLUDE_PATH += $(COMO_INCLUDE_PATH)$(SLASH)cnames ;
 
-    COMO_STDLIB_PATH ?= $(COMO_BASE)$(SLASH)$(DOTDOT)$(SLASH)libcomo ;
+    COMO_STDLIB_PATH ?= $(COMO_BASE)$(SLASH)libcomo ;
 
     COMO_BACKEND_SETUP = $(COMO_BACKEND_SETUP) ;
     newline = "
diff --git a/metrowerks-tools.jam b/metrowerks-tools.jam
index cc755556f..06b58099f 100644
--- a/metrowerks-tools.jam
+++ b/metrowerks-tools.jam
@@ -17,7 +17,7 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://www.metrowerks.com/products/windows/">Metrowerks<br>CodeWarrior</a>
+#//<a href="http://www.metrowerks.com/products/windows/">Metro-<br>werks<br>Code-<br>Warrior</a>
 
 # Get these variable set on the targets so that we can re-use the
 # build actions for other toolsets using this one as a base.
diff --git a/msvc-stlport-tools.jam b/msvc-stlport-tools.jam
index bf7ae3fbc..f73228334 100644
--- a/msvc-stlport-tools.jam
+++ b/msvc-stlport-tools.jam
@@ -28,7 +28,7 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Microsoft<br>VC++</a><br><a href="http://www.stlport.org/">STLport</a>
+#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a><br><a href="http://www.stlport.org/">STLport</a>
 
 # this is simply an extension to the msvc toolset. 
 extends-toolset msvc ;
diff --git a/msvc-tools.jam b/msvc-tools.jam
index 6363de404..65bb51c1a 100644
--- a/msvc-tools.jam
+++ b/msvc-tools.jam
@@ -8,7 +8,7 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Microsoft<br>VC++</a>
+#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a>
 
 # Get these variable set on the targets so that we can re-use the
 # build actions for other toolsets using this one as a base.
diff --git a/v1/como-tools.jam b/v1/como-tools.jam
index 2f59453b4..2fa5e2aa4 100644
--- a/v1/como-tools.jam
+++ b/v1/como-tools.jam
@@ -15,10 +15,10 @@ if ! $(COMO_PATH_SETUP) # do this once
     COMO_BIN_DIRECTORY ?= "" ; # Don't clobber tool names if COMO_ROOT_DIRECTORY not
                                # set
 
-    COMO_INCLUDE_PATH ?= $(COMO_BASE)$(SLASH)$(DOTDOT)$(SLASH)libcomo ;
+    COMO_INCLUDE_PATH ?= $(COMO_BASE)$(SLASH)libcomo ;
     COMO_INCLUDE_PATH += $(COMO_INCLUDE_PATH)$(SLASH)cnames ;
 
-    COMO_STDLIB_PATH ?= $(COMO_BASE)$(SLASH)$(DOTDOT)$(SLASH)libcomo ;
+    COMO_STDLIB_PATH ?= $(COMO_BASE)$(SLASH)libcomo ;
 
     COMO_BACKEND_SETUP = $(COMO_BACKEND_SETUP) ;
     newline = "
diff --git a/v1/metrowerks-tools.jam b/v1/metrowerks-tools.jam
index cc755556f..06b58099f 100644
--- a/v1/metrowerks-tools.jam
+++ b/v1/metrowerks-tools.jam
@@ -17,7 +17,7 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://www.metrowerks.com/products/windows/">Metrowerks<br>CodeWarrior</a>
+#//<a href="http://www.metrowerks.com/products/windows/">Metro-<br>werks<br>Code-<br>Warrior</a>
 
 # Get these variable set on the targets so that we can re-use the
 # build actions for other toolsets using this one as a base.
diff --git a/v1/msvc-stlport-tools.jam b/v1/msvc-stlport-tools.jam
index bf7ae3fbc..f73228334 100644
--- a/v1/msvc-stlport-tools.jam
+++ b/v1/msvc-stlport-tools.jam
@@ -28,7 +28,7 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Microsoft<br>VC++</a><br><a href="http://www.stlport.org/">STLport</a>
+#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a><br><a href="http://www.stlport.org/">STLport</a>
 
 # this is simply an extension to the msvc toolset. 
 extends-toolset msvc ;
diff --git a/v1/msvc-tools.jam b/v1/msvc-tools.jam
index 6363de404..65bb51c1a 100644
--- a/v1/msvc-tools.jam
+++ b/v1/msvc-tools.jam
@@ -8,7 +8,7 @@
 
 # The following #// line will be used by the regression test table generation
 # program as the column heading for HTML tables. Must not include version number.
-#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Microsoft<br>VC++</a>
+#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a>
 
 # Get these variable set on the targets so that we can re-use the
 # build actions for other toolsets using this one as a base.