diff --git a/libtransmission/block-info.cc b/libtransmission/block-info.cc
index f0d819ea6..24130a82d 100644
--- a/libtransmission/block-info.cc
+++ b/libtransmission/block-info.cc
@@ -19,8 +19,8 @@ void tr_block_info::init_sizes(uint64_t const total_size_in, uint32_t const piec
 
     total_size_ = total_size_in;
     piece_size_ = piece_size_in;
-    n_pieces_ = (total_size_ + piece_size_ - 1) / piece_size_;
-    n_blocks_ = (total_size_ + BlockSize - 1) / BlockSize;
+    n_pieces_ = static_cast<tr_piece_index_t>((total_size_ + piece_size_ - 1) / piece_size_);
+    n_blocks_ = static_cast<tr_block_index_t>((total_size_ + BlockSize - 1) / BlockSize);
 
     uint32_t remainder = total_size_ % piece_size_;
     final_piece_size_ = remainder != 0U ? remainder : piece_size_;
diff --git a/libtransmission/block-info.h b/libtransmission/block-info.h
index 21cc18b98..18a4c412f 100644
--- a/libtransmission/block-info.h
+++ b/libtransmission/block-info.h
@@ -88,8 +88,8 @@ public:
             }
             else
             {
-                loc.block = byte_idx / BlockSize;
-                loc.piece = byte_idx / piece_size();
+                loc.block = static_cast<tr_block_index_t>(byte_idx / BlockSize);
+                loc.piece = static_cast<tr_piece_index_t>(byte_idx / piece_size());
             }
 
             loc.block_offset = static_cast<uint32_t>(loc.byte - (uint64_t{ loc.block } * BlockSize));
diff --git a/libtransmission/variant.cc b/libtransmission/variant.cc
index b97e1f919..df8c42cd5 100644
--- a/libtransmission/variant.cc
+++ b/libtransmission/variant.cc
@@ -40,7 +40,7 @@ namespace
     return var != nullptr && (var->holds_alternative<tr_variant::Vector>() || var->holds_alternative<tr_variant::Map>());
 }
 
-[[nodiscard]] constexpr int variant_index(tr_variant const* const var)
+[[nodiscard]] constexpr size_t variant_index(tr_variant const* const var)
 {
     if (var != nullptr)
     {
diff --git a/libtransmission/variant.h b/libtransmission/variant.h
index acb59f88c..3264ad566 100644
--- a/libtransmission/variant.h
+++ b/libtransmission/variant.h
@@ -30,7 +30,7 @@
 struct tr_variant
 {
 public:
-    enum Type
+    enum Type : size_t
     {
         NoneIndex = 0,
         BoolIndex = 1,
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index cd02fd1b8..687db0551 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -899,7 +899,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
     //registering the Web UI to Bonjour
     if ([self.fDefaults boolForKey:@"RPC"] && [self.fDefaults boolForKey:@"RPCWebDiscovery"])
     {
-        [BonjourController.defaultController startWithPort:[self.fDefaults integerForKey:@"RPCPort"]];
+        [BonjourController.defaultController startWithPort:static_cast<int>([self.fDefaults integerForKey:@"RPCPort"])];
     }
 
     //shamelessly ask for donations
diff --git a/macosx/PrefsController.mm b/macosx/PrefsController.mm
index 5f81890bb..5e0cee08d 100644
--- a/macosx/PrefsController.mm
+++ b/macosx/PrefsController.mm
@@ -791,7 +791,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
     return static_cast<int>(components.hour * 60 + components.minute);
 }
 
-+ (NSDate*)timeSumToDate:(int)sum
++ (NSDate*)timeSumToDate:(NSInteger)sum
 {
     NSDateComponents* comps = [[NSDateComponents alloc] init];
     comps.hour = sum / 60;
@@ -1515,7 +1515,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
         self.fQueueSeedField.integerValue = seedQueueNum;
 
         //check stalled handled by bindings
-        self.fStalledField.intValue = stalledMinutes;
+        self.fStalledField.integerValue = stalledMinutes;
     }
 
     [NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
diff --git a/macosx/Torrent.mm b/macosx/Torrent.mm
index a65e9ff4d..ea732692b 100644
--- a/macosx/Torrent.mm
+++ b/macosx/Torrent.mm
@@ -88,7 +88,7 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error* error)
         NSError* localError;
         if (![Torrent trashFile:@(filename) error:&localError])
         {
-            error->set(localError.code, localError.description.UTF8String);
+            error->set(static_cast<int>(localError.code), localError.description.UTF8String);
             return false;
         }
     }