diff --git a/include/stdexec/__detail/__meta.hpp b/include/stdexec/__detail/__meta.hpp
index 8c9582c40..4b9cd91da 100644
--- a/include/stdexec/__detail/__meta.hpp
+++ b/include/stdexec/__detail/__meta.hpp
@@ -152,7 +152,7 @@ namespace STDEXEC {
 
   using __msuccess = int;
 
-  template <class _What, class... _With>
+  template <class... _What>
   struct _WARNING_ { };
 
   template <class... _What>
diff --git a/include/stdexec/__detail/__on.hpp b/include/stdexec/__detail/__on.hpp
index 3406fd8b2..f89369f35 100644
--- a/include/stdexec/__detail/__on.hpp
+++ b/include/stdexec/__detail/__on.hpp
@@ -29,6 +29,7 @@
 #include "__sender_adaptor_closure.hpp"
 #include "__sender_introspection.hpp"
 #include "__utility.hpp"
+#include "__write_env.hpp"
 
 namespace STDEXEC {
   /////////////////////////////////////////////////////////////////////////////
@@ -131,15 +132,12 @@ namespace STDEXEC {
     >;
 
     template <class _Sender, class _OldSched, class _NewSched>
-    static constexpr auto __reschedule(
-      _Sender&& __sndr,
-      [[maybe_unused]] _OldSched&& __old_sched,
-      _NewSched&& __new_sched) {
-      // BUGBUG TODO(ericniebler): FIXME
-      // return continues_on(
-      //   write_env(static_cast<_Sender&&>(__sndr), __sched_env{__old_sched}),
-      //   static_cast<_NewSched&&>(__new_sched));
-      return continues_on(static_cast<_Sender&&>(__sndr), static_cast<_NewSched&&>(__new_sched));
+    static constexpr auto
+      __reschedule(_Sender&& __sndr, _OldSched&& __old_sched, _NewSched&& __new_sched) {
+      return continues_on(
+        write_env(static_cast<_Sender&&>(__sndr), __sched_env{__old_sched}),
+        static_cast<_NewSched&&>(__new_sched));
+      // return continues_on(static_cast<_Sender&&>(__sndr), static_cast<_NewSched&&>(__new_sched));
     }
   };
 
diff --git a/test/stdexec/algos/adaptors/test_on3.cpp b/test/stdexec/algos/adaptors/test_on3.cpp
index 71b74b09d..0e3561390 100644
--- a/test/stdexec/algos/adaptors/test_on3.cpp
+++ b/test/stdexec/algos/adaptors/test_on3.cpp
@@ -126,7 +126,7 @@ namespace {
     auto snd = ex::get_scheduler() | ex::on(inline_scheduler{}, probe_env())
              | ex::then([]<class Env>(Env) noexcept {
                  using Sched = ex::__call_result_t<ex::get_scheduler_t, Env>;
-                 static_assert(std::same_as<Sched, ex::run_loop::scheduler>);
+                 static_assert(std::same_as<Sched, inline_scheduler>);
                })
              | probe_env() | ex::then([]<class Env>(Env) noexcept {
                  using Sched = ex::__call_result_t<ex::get_scheduler_t, Env>;