diff --git a/index.html b/index.html
index 5ba5c27..989eeb2 100644
--- a/index.html
+++ b/index.html
@@ -987,7 +987,7 @@ struct is_class<my_union>
 }
 
       </PRE>
-      <H2>Example code</H2>
+      <H2><A name="example"></A>Example code</H2>
       <p>Type-traits comes with four example programs that illustrate some of the ways 
          in which the type traits templates may be used:</p>
       <h4>Copy_example.cpp</h4>
diff --git a/test/tricky_abstract_type_test.cpp b/test/tricky_abstract_type_test.cpp
index e146740..4713cac 100644
--- a/test/tricky_abstract_type_test.cpp
+++ b/test/tricky_abstract_type_test.cpp
@@ -16,7 +16,9 @@
 TT_TEST_BEGIN(tricky_abstract_type_test)
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_empty<test_abc1>::value, false);
+#ifndef TEST_STD
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_stateless<test_abc1>::value, false);
+#endif
 
 TT_TEST_END
 
diff --git a/test/tricky_function_type_test.cpp b/test/tricky_function_type_test.cpp
index 8e2e16e..a3a0d71 100644
--- a/test/tricky_function_type_test.cpp
+++ b/test/tricky_function_type_test.cpp
@@ -20,7 +20,7 @@
 #  include <boost/type_traits/has_trivial_assign.hpp>
 #  include <boost/type_traits/has_trivial_destructor.hpp>
 #  include <boost/type_traits/is_compound.hpp>
-#  include <boost/type_traits/is_base_and_derived.hpp>
+#  include <boost/type_traits/is_base_of.hpp>
 #  include <boost/type_traits/is_convertible.hpp>
 #endif
 
@@ -39,7 +39,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_constructor<foo0_t>::value, fals
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_copy<foo0_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_assign<foo0_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_destructor<foo0_t>::value, false);
-BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_and_derived<foo0_t, foo0_t>::value), false);
+BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<foo0_t, foo0_t>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<foo0_t, int>::value), false);
 
 
diff --git a/test/tricky_partial_spec_test.cpp b/test/tricky_partial_spec_test.cpp
index a338d94..781e652 100644
--- a/test/tricky_partial_spec_test.cpp
+++ b/test/tricky_partial_spec_test.cpp
@@ -54,10 +54,10 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::alignment_of<char&>::value, ALIGNOF(void*));
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::alignment_of<char (&)(int)>::value, ALIGNOF(void*));
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::alignment_of<char(&)[4]>::value, ALIGNOF(void*));
 
-BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_and_derived<Base&,Derived>::value), false);
-BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_and_derived<Base&,Derived&>::value), false);
-BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_and_derived<Base,Derived&>::value), false);
-BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_and_derived<Base,void>::value), false);
+BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base&,Derived>::value), false);
+BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base&,Derived&>::value), false);
+BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base,Derived&>::value), false);
+BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base,void>::value), false);
 
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<void, int>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<void, void>::value), true);