diff --git a/doc/index.htm b/doc/index.htm
index c46f0713..82e55320 100644
--- a/doc/index.htm
+++ b/doc/index.htm
@@ -333,13 +333,13 @@ here</a> .</p>
 <h2>Authors and Credits</h2>
 
 <p>uBLAS initially was written by Joerg Walter and Mathias Koch. We
-would like to thank all, which supported the development of this
-library: David Abrahams, Ed Brey, Fernando Cacciola, Juan Jose
+would like to thank all, which supported and contributed to the development
+of this library: David Abrahams, Ed Brey, Fernando Cacciola, Juan Jose
 Gomez Cadenas, Beman Dawes, Matt Davies, Bob Fletcher, Kresimir Fresl,
-Joachim Kessel, Toon Knapen, Hendrik Kueck, John Maddock, Jens Maurer,
-Alexei Novakov, Gary Powell, Joachim Pyras, Peter Schmitteckert,
-Jeremy Siek, Markus Steffl, Michael Stevens, Benedikt Weber,
-Martin Weiser, Gunter Winkler, Marc Zimmermann
+Joachim Kessel, Patrick Kowalzick, Toon Knapen, Hendrik Kueck, John Maddock,
+Jens Maurer, Alexei Novakov, Gary Powell, Joachim Pyras,
+Peter Schmitteckert, Jeremy Siek, Markus Steffl, Michael Stevens,
+Benedikt Weber, Martin Weiser, Gunter Winkler, Marc Zimmermann
 and the members of <a href="http://www.boost.org">Boost</a></p>
 
 <h2>Frequently Asked Questions</h2>
diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
index 6a607bb9..6673bdd1 100644
--- a/include/boost/numeric/ublas/storage.hpp
+++ b/include/boost/numeric/ublas/storage.hpp
@@ -1818,8 +1818,8 @@ namespace boost { namespace numeric { namespace ublas {
         typedef typename V1::value_type value1_type;
         typedef typename V2::value_type value2_type;
 
-        typedef typename std::size_t size_type;
-        typedef typename std::ptrdiff_t difference_type;
+        typedef std::size_t size_type;
+        typedef std::ptrdiff_t difference_type;
         typedef index_pair<self_type> value_type;
         typedef value_type reference;
         // typedef const value_type& const_reference;
@@ -1980,8 +1980,8 @@ namespace boost { namespace numeric { namespace ublas {
         typedef typename V2::value_type value2_type;
         typedef typename V3::value_type value3_type;
 
-        typedef typename std::size_t size_type;
-        typedef typename std::ptrdiff_t difference_type;
+        typedef std::size_t size_type;
+        typedef std::ptrdiff_t difference_type;
         typedef index_triple<self_type> value_type;
         typedef value_type reference;
         // typedef const value_type& const_reference;
diff --git a/include/boost/numeric/ublas/traits.hpp b/include/boost/numeric/ublas/traits.hpp
index 1c7a1b97..f7373542 100644
--- a/include/boost/numeric/ublas/traits.hpp
+++ b/include/boost/numeric/ublas/traits.hpp
@@ -1005,10 +1005,11 @@ namespace boost { namespace numeric { namespace ublas {
 #endif
         typedef typename boost::mpl::if_c<index1 >= index2,
                                           iter1,
-                                          iter2>::type::type builtin_promote_type;
+                                          iter2>::type iter;
+        typedef typename iter::type builtin_promote_type;
         typedef typename boost::mpl::if_c<boost::is_same<T1, T2>::value,
                                           T1,
-                                          builtin_promote_type>::type promote_type;                         
+                                          builtin_promote_type>::type promote_type;
     };
 
     template<class T1, class T2>