diff --git a/include/boost/graph/detail/labeled_graph_traits.hpp b/include/boost/graph/detail/labeled_graph_traits.hpp
index f61c24a4..6eb10609 100644
--- a/include/boost/graph/detail/labeled_graph_traits.hpp
+++ b/include/boost/graph/detail/labeled_graph_traits.hpp
@@ -187,7 +187,7 @@ struct is_labeled_graph
     >
 { };
 
-template <typename> class graph_mutability_traits;
+template <typename> struct graph_mutability_traits;
 
 namespace graph_detail {
     // The determine mutability metafunction computes a labeled mutability tag
diff --git a/include/boost/graph/graph_test.hpp b/include/boost/graph/graph_test.hpp
index 182b38f7..fc4d9f0f 100644
--- a/include/boost/graph/graph_test.hpp
+++ b/include/boost/graph/graph_test.hpp
@@ -153,7 +153,7 @@ namespace boost {
       typedef typename graph_traits<Graph>::vertex_iterator v_iter;
       std::pair<v_iter, v_iter> p = vertices(g);
       BOOST_CHECK(num_vertices(g) == vertex_set.size());
-      v_size_t n = std::distance(p.first, p.second);
+      v_size_t n = (size_t)std::distance(p.first, p.second);
       BOOST_CHECK(n == num_vertices(g));
       for (; p.first != p.second; ++p.first) {
         vertex_t v = *p.first;
@@ -173,7 +173,7 @@ namespace boost {
       BOOST_CHECK(m == num_edges(g));
       for (; p.first != p.second; ++p.first) {
         edge_t e = *p.first;
-        BOOST_CHECK(find_if(edge_set, connects(source(e, g), target(e, g), g)) != end(edge_set));
+        BOOST_CHECK(find_if(edge_set, connects(source(e, g), target(e, g), g)) != boost::end(edge_set));
         BOOST_CHECK(container_contains(vertex_set, source(e, g)) == true);
         BOOST_CHECK(container_contains(vertex_set, target(e, g)) == true);
       }
@@ -199,7 +199,7 @@ namespace boost {
           p = edge(*j, *k, g);
           if (p.second == true)
             BOOST_CHECK(find_if(edge_set, 
-              connects(source(p.first, g), target(p.first, g), g)) != end(edge_set));
+              connects(source(p.first, g), target(p.first, g), g)) != boost::end(edge_set));
         }
     }