diff --git a/include/sled/futures/detail/just.h b/include/sled/futures/detail/just.h
index cba8b15..38a78f8 100644
--- a/include/sled/futures/detail/just.h
+++ b/include/sled/futures/detail/just.h
@@ -25,15 +25,15 @@ struct JustSender {
     template<typename R>
     JustOperation<T, R> Connect(R receiver)
     {
-        return {value, receiver};
+        return {std::forward<T>(value), receiver};
     }
 };
 
 template<typename T>
 JustSender<T>
-Just(T value)
+Just(T &&value)
 {
-    return {value};
+    return {std::forward<T>(value)};
 }
 
 }// namespace detail
diff --git a/include/sled/futures/detail/then.h b/include/sled/futures/detail/then.h
index 075d152..2b497e8 100644
--- a/include/sled/futures/detail/then.h
+++ b/include/sled/futures/detail/then.h
@@ -13,12 +13,12 @@ struct ThenReceiver {
     F func;
     bool stopped = false;
 
-    template<typename U>
+    template<typename U, typename Ret = invoke_result_t<F, U>>
     void SetValue(U &&val)
     {
         if (stopped) { return; }
         try {
-            receiver.SetValue(func(std::forward<U>(val)));
+            receiver.SetValue(std::forward<Ret>(func(std::forward<U>(val))));
         } catch (...) {
             SetError(std::current_exception());
         }
@@ -49,7 +49,7 @@ struct ThenOperation {
 
 template<typename S, typename F>
 struct ThenSender {
-    using result_t = invoke_result_t<F, typename S::result_t>;
+    using result_t = invoke_result_t<F, typename decay_t<S>::result_t>;
     S sender;
     F func;
 
@@ -62,9 +62,9 @@ struct ThenSender {
 
 template<typename S, typename F>
 ThenSender<S, F>
-Then(S sender, F &&func)
+Then(S &&sender, F &&func)
 {
-    return {sender, std::forward<F>(func)};
+    return {std::forward<S>(sender), std::forward<F>(func)};
 }
 
 }// namespace detail
diff --git a/include/sled/futures/detail/traits.h b/include/sled/futures/detail/traits.h
index fe709a9..63b9b14 100644
--- a/include/sled/futures/detail/traits.h
+++ b/include/sled/futures/detail/traits.h
@@ -18,6 +18,9 @@ using ConnectResultT = typename ConnectResult<S, R>::type;
 template<typename F, typename... Args>
 using invoke_result_t = eggs::invoke_result_t<F, Args...>;
 
+template<typename T>
+using decay_t = typename std::decay<T>::type;
+
 }// namespace detail
 }// namespace sled
 #endif// SLED_FUTURES_DETAIL_TRAITS_H