diff --git a/include/ftxui/component/component.hpp b/include/ftxui/component/component.hpp
index 1582e3b0..78d34e80 100644
--- a/include/ftxui/component/component.hpp
+++ b/include/ftxui/component/component.hpp
@@ -23,7 +23,7 @@ struct MenuEntryOption;
 
 template <class T, class... Args>
 std::shared_ptr<T> Make(Args&&... args) {
-  return std::make_shared<T>(args...);
+  return std::make_shared<T>(std::forward<Args>(args)...);
 }
 
 namespace Container {
diff --git a/include/ftxui/util/ref.hpp b/include/ftxui/util/ref.hpp
index ff1133ae..e806200c 100644
--- a/include/ftxui/util/ref.hpp
+++ b/include/ftxui/util/ref.hpp
@@ -27,7 +27,8 @@ template <typename T>
 class Ref {
  public:
   Ref() {}
-  Ref(T t) : owned_(t) {}
+  Ref(const T& t) : owned_(t) {}
+  Ref(T&& t) : owned_(std::forward<T>(t)) {}
   Ref(T* t) : address_(t) {}
   T& operator*() { return address_ ? *address_ : owned_; }
   T& operator()() { return address_ ? *address_ : owned_; }