3 files changed, 4 insertions, 4 deletions
diff --git a/include/chilbert/detail/BitVecIndex.hpp b/include/chilbert/detail/BitVecIndex.hpp
index a514c21..7eb128d 100644
--- a/include/chilbert/detail/BitVecIndex.hpp
+++ b/include/chilbert/detail/BitVecIndex.hpp
@@ -21,7 +21,7 @@ struct BitVecIndex {
 
   explicit BitVecIndex(const size_t bits)
     : rack{bits / bits_per_rack}
-    , bit{bits - rack * bits_per_rack}
+    , bit{bits - (rack * bits_per_rack)}
   {
     assert(bit < bits_per_rack);
   }
diff --git a/include/chilbert/detail/MultiBitVec.hpp b/include/chilbert/detail/MultiBitVec.hpp
index e3a305d..1317d3b 100644
--- a/include/chilbert/detail/MultiBitVec.hpp
+++ b/include/chilbert/detail/MultiBitVec.hpp
@@ -111,7 +111,7 @@ public:
   /// Clear any bits in storage outside the valid range if necessary
   void truncate()
   {
-    if (const auto pad = num_racks() * bits_per_rack - size()) {
+    if (const auto pad = (num_racks() * bits_per_rack) - size()) {
       rack(num_racks() - 1) &= ~Rack{0} >> pad;
     }
   }
diff --git a/test/test_utils.hpp b/test/test_utils.hpp
index 5f4c03f..cc9c1f8 100644
--- a/test/test_utils.hpp
+++ b/test/test_utils.hpp
@@ -44,7 +44,7 @@ static inline size_t
 rand_between(Context& ctx, const size_t min, const size_t max)
 {
   assert(max >= min);
-  const size_t r = (max == min) ? min : ctx.dist(ctx.rng) % (max - min) + min;
+  const size_t r = (max == min) ? min : (ctx.dist(ctx.rng) % (max - min)) + min;
   assert(r >= min && r < max);
   return r;
 }
@@ -58,7 +58,7 @@ make_random_precisions(Context& ctx)
 
   size_t bits_left = N;
   for (size_t i = 0; i < D; ++i) {
-    ms[i] = rand_between(ctx, 1, std::min(Max, bits_left / (D - i) + 1));
+    ms[i] = rand_between(ctx, 1, std::min(Max, (bits_left / (D - i)) + 1));
     bits_left -= ms[i];
   }