diff --git a/libtransmission/block-info.h b/libtransmission/block-info.h
index 18a4c412f..cd06c67b4 100644
--- a/libtransmission/block-info.h
+++ b/libtransmission/block-info.h
@@ -14,7 +14,9 @@ struct tr_block_info
 public:
     static auto constexpr BlockSize = uint32_t{ 1024U * 16U };
 
-    tr_block_info() noexcept = default;
+    tr_block_info() noexcept
+    {
+    }
 
     tr_block_info(uint64_t const total_size_in, uint32_t const piece_size_in) noexcept
     {
diff --git a/libtransmission/variant.h b/libtransmission/variant.h
index 5962384b4..ad82d6c74 100644
--- a/libtransmission/variant.h
+++ b/libtransmission/variant.h
@@ -180,9 +180,9 @@ public:
     tr_variant& operator=(tr_variant&& that) noexcept = default;
 
     template<typename Val>
-    tr_variant(Val value)
+    tr_variant(Val&& value)
     {
-        *this = std::move(value);
+        *this = std::forward<Val>(value);
     }
 
     [[nodiscard]] static auto make_map(size_t const n_reserve = 0U) noexcept