diff --git a/dependencies/cub b/dependencies/cub
index 9be5b3b91..7106f9019 160000
--- a/dependencies/cub
+++ b/dependencies/cub
@@ -1 +1 @@
-Subproject commit 9be5b3b912c4c62074b5b3d3e143836575831a36
+Subproject commit 7106f901990803ca512cd7d9e6d7d2782f2c4839
diff --git a/thrust/device_new_allocator.h b/thrust/device_new_allocator.h
index c9c6b0e95..645be1c02 100644
--- a/thrust/device_new_allocator.h
+++ b/thrust/device_new_allocator.h
@@ -25,10 +25,7 @@
 #include <thrust/device_reference.h>
 #include <thrust/device_new.h>
 #include <thrust/device_delete.h>
-
-#include <cuda/std/cstdint>
-#include <cuda/std/limits>
-
+#include <limits>
 #include <stdexcept>
 
 THRUST_NAMESPACE_BEGIN
@@ -64,8 +61,8 @@ template<typename T>
     /*! \c const reference to allocated element, \c device_reference<const T>. */
     typedef device_reference<const T>         const_reference;
 
-    /*! Type of allocation size, \c ::cuda::std::size_t. */
-    typedef ::cuda::std::size_t                 size_type;
+    /*! Type of allocation size, \c std::size_t. */
+    typedef std::size_t                       size_type;
 
     /*! Type of allocation difference, \c pointer::difference_type. */
     typedef typename pointer::difference_type difference_type;
@@ -150,7 +147,7 @@ template<typename T>
     __host__ __device__
     inline size_type max_size() const
     {
-      return ::cuda::std::numeric_limits<size_type>::max THRUST_PREVENT_MACRO_SUBSTITUTION () / sizeof(T);
+      return std::numeric_limits<size_type>::max THRUST_PREVENT_MACRO_SUBSTITUTION () / sizeof(T);
     } // end max_size()
 
     /*! Compares against another \p device_malloc_allocator for equality.
diff --git a/thrust/optional.h b/thrust/optional.h
index 5850b6ea0..52008e4f6 100644
--- a/thrust/optional.h
+++ b/thrust/optional.h
@@ -1580,7 +1580,7 @@ class optional : private detail::optional_move_assign_base<T>,
 
     *this = nullopt;
     this->construct(std::forward<Args>(args)...);
-    return this->m_value;
+    return value();
   }
 
   /// \group emplace
@@ -1594,7 +1594,7 @@ class optional : private detail::optional_move_assign_base<T>,
   emplace(std::initializer_list<U> il, Args &&... args) {
     *this = nullopt;
     this->construct(il, std::forward<Args>(args)...);
-    return this->m_value;
+    return value();
   }
 
   /// Swaps this optional with the other.