diff --git a/thrust/system/cuda/detail/scan_by_key.h b/thrust/system/cuda/detail/scan_by_key.h
index fe4b321c0..ed6d7db56 100644
--- a/thrust/system/cuda/detail/scan_by_key.h
+++ b/thrust/system/cuda/detail/scan_by_key.h
@@ -512,7 +512,7 @@ namespace __scan_by_key {
             inequality_op(equality_op_),
             scan_op(scan_op_)
       {
-        int  tile_idx      = blockIdx.x;
+        Size tile_idx      = blockIdx.x;
         Size tile_base     = ITEMS_PER_TILE * tile_idx;
         Size num_remaining = num_items - tile_base;
 
@@ -734,7 +734,7 @@ namespace __scan_by_key {
                              ScanOp                     scan_op,
                              AddInitToScan              add_init_to_scan)
   {
-    int          num_items    = static_cast<int>(thrust::distance(keys_first, keys_last));
+    Size         num_items    = static_cast<Size>(thrust::distance(keys_first, keys_last));
     size_t       storage_size = 0;
     cudaStream_t stream       = cuda_cub::stream(policy);
     bool         debug_sync   = THRUST_DEBUG_SYNC_FLAG;