diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp
index 3dc320abe2d..e229f9b7d23 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp
@@ -5,6 +5,7 @@
 
 #ifdef __i386__
 #include "barretenberg/common/serialize.hpp"
+#include <concepts>
 
 namespace numeric {
 
@@ -37,7 +38,7 @@ class alignas(32) uint128_t {
     constexpr ~uint128_t() = default;
     explicit constexpr operator bool() const { return static_cast<bool>(data[0]); };
 
-    template <typename T> explicit constexpr operator T() const { return static_cast<T>(data[0]); };
+    template <std::integral T> explicit constexpr operator T() const { return static_cast<T>(data[0]); };
 
     [[nodiscard]] constexpr bool get_bit(uint64_t bit_index) const;
     [[nodiscard]] constexpr uint64_t get_msb() const;
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
index d8cd9ef2f18..5ddaa9713ae 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
@@ -14,6 +14,7 @@
 #include "../uint128/uint128.hpp"
 #include "barretenberg/common/serialize.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
+#include <concepts>
 #include <cstdint>
 #include <iomanip>
 #include <iostream>
@@ -91,7 +92,7 @@ class alignas(32) uint256_t {
 
     explicit constexpr operator bool() const { return static_cast<bool>(data[0]); };
 
-    template <typename T> explicit constexpr operator T() const { return static_cast<T>(data[0]); };
+    template <std::integral T> explicit constexpr operator T() const { return static_cast<T>(data[0]); };
 
     [[nodiscard]] constexpr bool get_bit(uint64_t bit_index) const;
     [[nodiscard]] constexpr uint64_t get_msb() const;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
index 18e2cbe129e..5111ea71a54 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
@@ -266,7 +266,7 @@ template <typename Builder> class BigFieldBase {
                 mask = (uint256_t(1) << mask_size) - 1;
                 // Choose the bit range
                 // Return instruction
-                return { .id = instruction_opcode, .arguments.element = Element(temp & mask) };
+                return { .id = instruction_opcode, .arguments.element = Element(static_cast<uint64_t>(temp & mask)) };
 
                 break;
             case OPCODE::RANDOMSEED: