diff --git a/src/twaalgos/emptiness.cc b/src/twaalgos/emptiness.cc
index f092c1663..73c66a432 100644
--- a/src/twaalgos/emptiness.cc
+++ b/src/twaalgos/emptiness.cc
@@ -254,9 +254,9 @@ namespace spot
   }
 
   std::ostream&
-  operator<<(std::ostream& os, const twa_run_ptr& run)
+  operator<<(std::ostream& os, const twa_run& run)
   {
-    auto& a = run->aut;
+    auto& a = run.aut;
     bdd_dict_ptr d = a->get_dict();
 
     auto pstep = [&](const twa_run::step& st)
@@ -268,11 +268,11 @@ namespace spot
       os << '\n';
     };
 
-    os << "Prefix:" << std::endl;
-    for (auto& s: run->prefix)
+    os << "Prefix:\n";
+    for (auto& s: run.prefix)
       pstep(s);
-    os << "Cycle:" << std::endl;
-    for (auto& s: run->cycle)
+    os << "Cycle:\n";
+    for (auto& s: run.cycle)
       pstep(s);
     return os;
   }
diff --git a/src/twaalgos/emptiness.hh b/src/twaalgos/emptiness.hh
index b3e72fd27..ac29a8574 100644
--- a/src/twaalgos/emptiness.hh
+++ b/src/twaalgos/emptiness.hh
@@ -332,7 +332,7 @@ namespace spot
     /// actually exists in the automaton (and will also display any
     /// transition annotation).
     SPOT_API
-    friend std::ostream& operator<<(std::ostream& os, const twa_run_ptr& run);
+    friend std::ostream& operator<<(std::ostream& os, const twa_run& run);
   };
   /// @}
 
diff --git a/wrap/python/spot_impl.i b/wrap/python/spot_impl.i
index 298f08a63..0e99b22eb 100644
--- a/wrap/python/spot_impl.i
+++ b/wrap/python/spot_impl.i
@@ -383,7 +383,7 @@ namespace std {
   }
 }
 
-%extend spot::twa_run_ptr {
+%extend spot::twa_run {
   std::string __str__()
   {
     std::ostringstream os;