diff --git a/doc/dijkstra_shortest_paths.html b/doc/dijkstra_shortest_paths.html
index 40f55c0d..4ed19711 100644
--- a/doc/dijkstra_shortest_paths.html
+++ b/doc/dijkstra_shortest_paths.html
@@ -390,7 +390,7 @@ OUT: <tt>visitor(DijkstraVisitor v)</tt>
 <H3>Complexity</H3>
 
 <P>
-The time complexity is <i>O(V log V)</i>.
+The time complexity is <i>O(V log V + E)</i>.
 
 
 <h3>Visitor Event Points</h3>
diff --git a/doc/dijkstra_shortest_paths_no_color_map.html b/doc/dijkstra_shortest_paths_no_color_map.html
index c08cc57e..e1cc1c8e 100644
--- a/doc/dijkstra_shortest_paths_no_color_map.html
+++ b/doc/dijkstra_shortest_paths_no_color_map.html
@@ -322,7 +322,7 @@ OUT: <tt>visitor(DijkstraVisitor v)</tt>
 <H3>Complexity</H3>
 
 <P>
-The time complexity is <i>O(V log V)</i>.
+The time complexity is <i>O(V log V + E)</i>.
 
 
 <h3>Visitor Event Points</h3>
diff --git a/doc/file_dependency_example.html b/doc/file_dependency_example.html
index c600b74c..fed8ef6a 100644
--- a/doc/file_dependency_example.html
+++ b/doc/file_dependency_example.html
@@ -211,7 +211,7 @@ main observation for determining the ``time slot'' for a file is that
 the time slot must be one more than the maximum time-slot of the files
 it depends on.
 
-<P>We start be creating a vector <code>time</code> that will store the
+<P>We start by creating a vector <code>time</code> that will store the
   time step at which each file can be built. We initialize every value
   with time step zero.</p>
 
diff --git a/doc/fruchterman_reingold.html b/doc/fruchterman_reingold.html
index f8a61d6d..f0ea6bd9 100644
--- a/doc/fruchterman_reingold.html
+++ b/doc/fruchterman_reingold.html
@@ -216,7 +216,7 @@ IN: <tt>vertex_index_map(VertexIndexMap i_map)</tt>
 <H3>Complexity</H3>
 
 <P> The time complexity is <i>O(|V|<sup>2</sup> + |E|)</i> for each
-iteration of the algorithm in the worse case. The average case for the
+iteration of the algorithm in the worst case. The average case for the
 grid variant is <i>O(|V| + |E|)</i>. The number of iterations is
 determined by the cooling schedule.
 
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index c85df0ca..fa7ebf9d 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -30,3 +30,6 @@ exe ospf-example : ospf-example.cpp ../build//boost_graph ;
 exe implicit_graph : implicit_graph.cpp ;
 exe astar_maze : astar_maze.cpp ;
 exe stoer_wagner : stoer_wagner.cpp ;
+exe bfs-example : bfs-example.cpp ;
+exe bfs-example2 : bfs-example2.cpp ;
+exe dfs-example : dfs-example.cpp ;
diff --git a/example/actor_clustering.cpp b/example/actor_clustering.cpp
index a2925647..9b1b4022 100644
--- a/example/actor_clustering.cpp
+++ b/example/actor_clustering.cpp
@@ -9,7 +9,7 @@
 
 // This program performs betweenness centrality (BC) clustering on the
 // actor collaboration graph available at
-// http://www.nd.edu/~networks/database/index.html and outputs the
+// http://www.nd.edu/~networks/resources/actor/actor.dat.gz and outputs the
 // result of clustering in Pajek format.
 //
 // This program mimics the BC clustering algorithm program implemented
diff --git a/example/bfs-example.cpp b/example/bfs-example.cpp
index 20e3b8da..0f340ccf 100644
--- a/example/bfs-example.cpp
+++ b/example/bfs-example.cpp
@@ -8,7 +8,7 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/pending/indirect_cmp.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
 
 #include <iostream>
 
diff --git a/example/bfs-example2.cpp b/example/bfs-example2.cpp
index 8225327e..d7cb2dd2 100644
--- a/example/bfs-example2.cpp
+++ b/example/bfs-example2.cpp
@@ -8,7 +8,7 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/pending/indirect_cmp.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
 
 #include <iostream>
 
diff --git a/example/dfs-example.cpp b/example/dfs-example.cpp
index 017053de..efb2b57e 100644
--- a/example/dfs-example.cpp
+++ b/example/dfs-example.cpp
@@ -7,7 +7,7 @@
 //=======================================================================
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/depth_first_search.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
 #include <boost/pending/indirect_cmp.hpp>
 
 #include <iostream>
diff --git a/src/graphml.cpp b/src/graphml.cpp
index 87cab74c..3571b06f 100644
--- a/src/graphml.cpp
+++ b/src/graphml.cpp
@@ -92,7 +92,6 @@ public:
         // Search for edges
         BOOST_FOREACH(const ptree::value_type& edge, *gr) {
           if (edge.first != "edge") continue;
-          std::string id = edge.second.get<std::string>(path("<xmlattr>/id"));
           std::string source = edge.second.get<std::string>(path("<xmlattr>/source"));
           std::string target = edge.second.get<std::string>(path("<xmlattr>/target"));
           std::string local_directed = edge.second.get(path("<xmlattr>/directed"), "");
diff --git a/src/read_graphviz_new.cpp b/src/read_graphviz_new.cpp
index 80012483..130a112c 100644
--- a/src/read_graphviz_new.cpp
+++ b/src/read_graphviz_new.cpp
@@ -718,7 +718,7 @@ namespace read_graphviz_detail {
               std::string rhs = "true";
               if (peek().type == token::equal) {
                 get();
-                if (peek().type != token::identifier) error("Wanted identifier as value of attributed");
+                if (peek().type != token::identifier) error("Wanted identifier as value of attribute");
                 rhs = get().normalized_value;
               }
               props[lhs] = rhs;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 5e01a4e3..e0cb54ac 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -120,7 +120,7 @@ test-suite graph_test :
     [ run incremental_components_test.cpp ]
     [ run random_spanning_tree_test.cpp ../build//boost_graph ]
     [ run graphml_test.cpp ../build//boost_graph : : "graphml_test.xml" ]
-    [ run stoer_wagner_test.cpp ../../test/build : $(TEST_DIR) ]
+    [ run stoer_wagner_test.cpp ../../test/build//boost_unit_test_framework/<link>static : $(TEST_DIR) ]
     ;
 
 # Run SDB tests only when -sSDB= is set.
diff --git a/test/graphviz_test.cpp b/test/graphviz_test.cpp
index 5ff2f80b..765175df 100644
--- a/test/graphviz_test.cpp
+++ b/test/graphviz_test.cpp
@@ -97,6 +97,7 @@ bool test_graph(std::istream& dotfile, std::size_t correct_num_vertices,
         std::string node_name = get(name,*i);
         //  - get its mass
         float node_mass = get(mass,*i);
+        BOOST_CHECK(masses.find(node_name) != masses.end());
         float ref_mass = masses.find(node_name)->second;
         //  - compare the mass to the result in the table
         BOOST_CHECK_CLOSE(node_mass, ref_mass, 0.01f);
@@ -114,6 +115,7 @@ bool test_graph(std::istream& dotfile, std::size_t correct_num_vertices,
                                 get(name, target(*i,graph)));
         // - get its weight
         double edge_weight = get(weight,*i);
+        BOOST_CHECK(weights.find(edge_name) != weights.end());
         double ref_weight = weights.find(edge_name)->second;
         // - compare the weight to teh result in the table
         BOOST_CHECK_CLOSE(edge_weight, ref_weight, 0.01);
diff --git a/test/stoer_wagner_test.cpp b/test/stoer_wagner_test.cpp
index 1fc4332b..7a1f64f7 100644
--- a/test/stoer_wagner_test.cpp
+++ b/test/stoer_wagner_test.cpp
@@ -3,6 +3,8 @@
 //   (See accompanying file LICENSE_1_0.txt or the copy at
 //         http://www.boost.org/LICENSE_1_0.txt)
 
+// #define BOOST_TEST_DYN_LINK 1
+#define BOOST_TEST_NO_LIB 1
 #include <fstream>
 #include <iostream>
 #include <map>
@@ -16,7 +18,6 @@
 #include <boost/graph/stoer_wagner_min_cut.hpp>
 #include <boost/graph/property_maps/constant_property_map.hpp>
 #include <boost/property_map/property_map.hpp>
-#define BOOST_TEST_DYN_LINK 1
 #include <boost/test/unit_test.hpp>
 #include <boost/tuple/tuple.hpp>