      }
      // compute and register the product, then return the new tag
      catch(const std::out_of_range& e) {
-Index: applications/dmrg/mps/framework/dmrg/models/op_handler.h
-===================================================================
---- applications/dmrg/mps/framework/dmrg/models/op_handler.h	(revision 7814)
-+++ applications/dmrg/mps/framework/dmrg/models/op_handler.h	(revision 7819)
-@@ -143,6 +143,7 @@
-     typedef TagHandler<Matrix, SymmGroup> base;
-     typedef typename OPTable<Matrix, SymmGroup>::tag_type tag_type;
-     typedef typename base::op_t op_t;
-+    typedef typename base::pair_map_it_t pair_map_it_t;
- 
- public:
- 
 Index: applications/dmrg/mps/framework/dmrg/sim/sim.hpp
 ===================================================================
 --- applications/dmrg/mps/framework/dmrg/sim/sim.hpp	(revision 7814)
-+++ applications/dmrg/mps/framework/dmrg/sim/sim.hpp	(revision 7819)
++++ applications/dmrg/mps/framework/dmrg/sim/sim.hpp	(working copy)
 @@ -148,12 +148,8 @@
  {
      std::ostringstream oss;

Index: applications/dmrg/mps/framework/dmrg/mp_tensors/mps_initializers.h
===================================================================
--- applications/dmrg/mps/framework/dmrg/mp_tensors/mps_initializers.h	(revision 7814)
+++ applications/dmrg/mps/framework/dmrg/mp_tensors/mps_initializers.h	(revision 7819)
@@ -462,7 +462,7 @@
         std::vector<boost::tuple<charge, size_t> > state(mps.length());
         for (int i=0; i<mps.length(); ++i)
             state[i] = boost::make_tuple(C, occupation[i]);
-        mps = state_mps<Matrix>(state, phys_dims, site_type);

         if (mps[mps.length()-1].col_dim()[0].first != right_end)
             throw std::runtime_error("Initial state does not satisfy total quantum numbers.");
     }
Index: applications/dmrg/mps/framework/dmrg/mp_tensors/state_mps.h
===================================================================
--- applications/dmrg/mps/framework/dmrg/mp_tensors/state_mps.h	(revision 7814)
+++ applications/dmrg/mps/framework/dmrg/mp_tensors/state_mps.h	(working copy)
@@ -32,7 +32,7 @@
 #include <boost/tuple/tuple.hpp>
 
 template <class Matrix, class SymmGroup>
-MPS<Matrix, SymmGroup> state_mps(std::vector<boost::tuple<typename SymmGroup::charge, size_t> > const & state,
+MPS<Matrix, SymmGroup> state_mps(std::vector<boost::tuple<typename SymmGroup::charge, std::size_t> > const & state,
                                  std::vector<Index<SymmGroup> > const& phys_dims, std::vector<int> const& site_type)
 {
     typedef typename SymmGroup::charge charge;
