diff --git a/cub/cub/device/device_segmented_sort.cuh b/cub/cub/device/device_segmented_sort.cuh
index 1e9a26741d7..22c9e12fb83 100644
--- a/cub/cub/device/device_segmented_sort.cuh
+++ b/cub/cub/device/device_segmented_sort.cuh
@@ -50,10 +50,10 @@
 CUB_NAMESPACE_BEGIN
 
 
-template<typename RefT, typename WrappedItT, typename VanillaItT>
-void debug_fail(WrappedItT wrapped, VanillaItT vanilla)
+template<typename BaseItT, typename AdvancedItT>
+void debug_fail(BaseItT wrapped, AdvancedItT vanilla)
 {
-  static_assert(std::is_same<WrappedItT, void>::value, "Debug...");
+  static_assert(std::is_same<BaseItT, void>::value, "Debug...");
 }
 
 template <typename Iterator, typename OffsetItT>
@@ -79,7 +79,8 @@ private:
 
   _CCCL_HOST_DEVICE typename super_t::reference dereference() const
   {
-    debug_fail<typename super_t::reference>(*(this->base() + (*offset_it)), *it);
+    debug_fail(it, it + *offset_it);
+    // debug_fail<typename super_t::reference>(*(this->base() + (*offset_it)), *it);
     return *(this->base() + (*offset_it));
   }
 };
diff --git a/thrust/thrust/iterator/iterator_adaptor.h b/thrust/thrust/iterator/iterator_adaptor.h
index 44b854b065b..a427b628e11 100644
--- a/thrust/thrust/iterator/iterator_adaptor.h
+++ b/thrust/thrust/iterator/iterator_adaptor.h
@@ -211,7 +211,7 @@ class _CCCL_DECLSPEC_EMPTY_BASES iterator_adaptor
 
     // counting_iterator will pick eg. diff_t=int64 when base=int32.
     // Explicitly cast to avoid static conversion warnings.
-    m_iterator = (m_iterator + n);
+    m_iterator = static_cast<base_type>(m_iterator + n);
   }
 
   _CCCL_EXEC_CHECK_DISABLE