diff --git a/include/boost/thread/executors/scheduler.hpp b/include/boost/thread/executors/scheduler.hpp
index 19e88df7..12a51146 100644
--- a/include/boost/thread/executors/scheduler.hpp
+++ b/include/boost/thread/executors/scheduler.hpp
@@ -38,7 +38,7 @@ namespace boost
       }
 
     private:
-      Executor&   ex;
+      Executor   ex;
       Function funct;
     };
 
@@ -103,7 +103,7 @@ namespace boost
 
     private:
       Scheduler   sch;
-      Executor&   ex;
+      Executor   ex;
       typename clock::time_point  tp;
       bool  is_closed;
     };
@@ -153,7 +153,7 @@ namespace boost
 
     private:
       Scheduler sch;
-      Executor &ex;
+      Executor ex;
     }; //end class
 
     /// Wraps a reference to a @c Scheduler providing an @c Executor that
@@ -276,12 +276,12 @@ namespace boost
 
       void submit_at(work w, const time_point& tp)
       {
-        return pimpl->submit_at(w, tp);
+        return pimpl->submit_at(boost::move(w), tp);
       }
 
       void submit_after(work w, const duration& d)
       {
-        return pimpl->submit_after(w, d);
+        return pimpl->submit_after(boost::move(w), d);
       }
 
       template <class Ex>
diff --git a/include/boost/thread/executors/work.hpp b/include/boost/thread/executors/work.hpp
index e4a26d48..bdaf7651 100644
--- a/include/boost/thread/executors/work.hpp
+++ b/include/boost/thread/executors/work.hpp
@@ -18,8 +18,8 @@ namespace boost
     typedef detail::nullary_function<void()> work;
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    //typedef detail::nullary_function<void()> work_pq;
-    typedef csbl::function<void()> work_pq;
+    typedef detail::nullary_function<void()> work_pq;
+    //typedef csbl::function<void()> work_pq;
 #else
     typedef csbl::function<void()> work_pq;
 #endif
diff --git a/test/test_scheduler.cpp b/test/test_scheduler.cpp
index 3fd1ca1f..c72715b8 100644
--- a/test/test_scheduler.cpp
+++ b/test/test_scheduler.cpp
@@ -27,7 +27,6 @@ typedef boost::executors::basic_thread_pool thread_pool;
 
 void fn(int x)
 {
-  //std::cout << "[" << __LINE__ << "] " << steady_clock::now() << std::endl;
     std::cout << x << std::endl;
 }
 
@@ -75,7 +74,6 @@ int main()
   test_after(5, sch);
   test_at(5, sch);
   test_on(5, sch, tp);
-  boost::this_thread::sleep_for(boost::chrono::seconds(10));
   std::cout << "[" << __LINE__ << "] " << std::endl;
 
   return boost::report_errors();