diff --git a/build/Jamfile b/build/Jamfile
index f56aa87..bace553 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -13,18 +13,24 @@ rule wave
 
 actions wave
 {
-  $(BOOST_ROOT)/dist/bin/wave -S$(BOOST_ROOT) $(>) -o $(<)
+  ../../../dist/bin/wave -S../../.. $(>) -o $(<)
 }
 
-make $(BOOST_ROOT)/libs/function_types/build/timestamps/arity_loops
+make ../../../libs/function_types/build/timestamps/arity_loops
   : preprocess_arity_loops.cpp : wave 
   ;
 
-make $(BOOST_ROOT)/libs/function_types/build/timestamps/encoding
+explicit ../../../libs/function_types/build/timestamps/arity_loops ; 
+
+make ../../../libs/function_types/build/timestamps/encoding
   : preprocess_encoding.cpp : wave 
   ;
 
-make $(BOOST_ROOT)/libs/function_types/build/timestamps/cc_names
+explicit ../../../libs/function_types/build/timestamps/encoding ;
+
+make ../../../libs/function_types/build/timestamps/cc_names
   : preprocess_cc_names.cpp : wave
   ;
 
+explicit ../../../libs/function_types/build/timestamps/cc_names ;
+
diff --git a/doc/function_types.qbk b/doc/function_types.qbk
index 0f989ae..2d97d32 100644
--- a/doc/function_types.qbk
+++ b/doc/function_types.qbk
@@ -1099,6 +1099,7 @@ library in one or the other way:
 * Jonathan Turkanis
 * Pavel Vozenilek
 * Steven Watanabe
+* K. Noel Belcourt
 
 [endsect]
 
diff --git a/doc/html/boost_functiontypes/acknowledgements.html b/doc/html/boost_functiontypes/acknowledgements.html
index 4d335cd..414b34e 100644
--- a/doc/html/boost_functiontypes/acknowledgements.html
+++ b/doc/html/boost_functiontypes/acknowledgements.html
@@ -71,6 +71,9 @@
 <li>
         Steven Watanabe
       </li>
+<li>
+        K. Noel Belcourt
+      </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
diff --git a/include/boost/function_types/detail/cv_traits.hpp b/include/boost/function_types/detail/cv_traits.hpp
index e5b2706..242f45b 100644
--- a/include/boost/function_types/detail/cv_traits.hpp
+++ b/include/boost/function_types/detail/cv_traits.hpp
@@ -13,8 +13,7 @@
 #include <boost/detail/workaround.hpp>
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582) \
-    || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
+    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
 #   include <boost/type_traits/remove_cv.hpp>
 #   include <boost/type_traits/remove_pointer.hpp>
 #   include <boost/type_traits/remove_reference.hpp>
@@ -24,12 +23,8 @@
 
 namespace boost { namespace function_types { namespace detail {
 
-namespace ft = boost::function_types;
-
-
 #if ! (defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582) \
-    || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590)))
+    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582))
 
 template<typename T> struct cv_traits 
 { typedef non_cv tag; typedef T type; };
@@ -113,12 +108,13 @@ struct cv_code
 {
   static T _t;
   BOOST_STATIC_CONSTANT(std::size_t, value = 
-      sizeof(ft::detail::switch_cv(ft::detail::ref_to_ptr(_t) ) ));
+      sizeof(::boost::function_types::detail::switch_cv(
+         ::boost::function_types::detail::ref_to_ptr(_t) ) ));
 };
 
 template<typename T> struct cv_traits 
 {
-  typedef typename ft::detail::cv_tag_impl< 
+  typedef typename boost::function_types::detail::cv_tag_impl< 
     ::boost::function_types::detail::cv_code<T>::value >::type
   tag;