diff --git a/include/boost/graph/kolmogorov_max_flow.hpp b/include/boost/graph/kolmogorov_max_flow.hpp
index ae476f32..c2b94c09 100644
--- a/include/boost/graph/kolmogorov_max_flow.hpp
+++ b/include/boost/graph/kolmogorov_max_flow.hpp
@@ -32,9 +32,11 @@
 #ifndef BOOST_KOLMOGOROV_MAX_FLOW_HPP
 #define BOOST_KOLMOGOROV_MAX_FLOW_HPP
 
-#warning \
-  The kolmogorov_max_flow.hpp header is deprecated and will be removed \
-  in Boost 1.46. Use boykov_kolmogorov_max_flow.hpp instead.
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+#  pragma message ("The kolmogorov_max_flow.hpp header is deprecated and will be removed in Boost 1.46. Use boykov_kolmogorov_max_flow.hpp instead.")
+#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
+#  warning "The kolmogorov_max_flow.hpp header is deprecated and will be removed in Boost 1.46. Use boykov_kolmogorov_max_flow.hpp instead."
+#endif
 
 #include <boost/config.hpp>
 #include <cassert>
diff --git a/include/boost/graph/random_spanning_tree.hpp b/include/boost/graph/random_spanning_tree.hpp
index 1f6ab269..e29f3fc4 100644
--- a/include/boost/graph/random_spanning_tree.hpp
+++ b/include/boost/graph/random_spanning_tree.hpp
@@ -48,7 +48,9 @@ namespace boost {
         if (get(color, v) != color_gen::white()) continue;
         loop_erased_random_walk(g, v, next_edge, color, path);
         for (typename std::vector<vertex_descriptor>::const_reverse_iterator i = path.rbegin();
-             boost::next(i) != path.rend(); ++i) {
+             boost::next(i) !=
+               (typename std::vector<vertex_descriptor>::const_reverse_iterator)path.rend();
+             ++i) {
           typename std::vector<vertex_descriptor>::const_reverse_iterator j = i;
           ++j;
           assert (get(color, *j) == color_gen::gray());
diff --git a/test/random_spanning_tree_test.cpp b/test/random_spanning_tree_test.cpp
index 95dcf3c1..db31e142 100644
--- a/test/random_spanning_tree_test.cpp
+++ b/test/random_spanning_tree_test.cpp
@@ -56,7 +56,7 @@ int main(int, char**) {
 
   BGL_FORALL_EDGES(e, g, graph_type) {put(weight, e, (1. + get(edge_index, g, e)) / num_edges(g));}
 
-  mt19937 gen;
+  boost::mt19937 gen;
   random_spanning_tree(g, gen, predecessor_map(pred));
   // write_spanning_tree(g, pred, constant_property_map<gt::edge_descriptor, double>(1.), "unweight_random_st.dot");
   random_spanning_tree(g, gen, predecessor_map(pred));