diff --git a/src/borg/_chunker.c b/src/borg/_chunker.c
index 9b7e7137f..20941cb07 100644
--- a/src/borg/_chunker.c
+++ b/src/borg/_chunker.c
@@ -63,7 +63,7 @@ static uint32_t table_base[] =
     0xc5ae37bb, 0xa76ce12a, 0x8150d8f3, 0x2ec29218, 0xa35f0984, 0x48c0647e, 0x0b5ff98c, 0x71893f7b
 };
 
-#define BARREL_SHIFT(v, shift) ( ((v) << shift) | ((v) >> ((32 - shift) & 0x1f)) )
+#define BARREL_SHIFT(v, shift) ( ((v) << (shift)) | ((v) >> ((32 - (shift)) & 0x1f)) )
 
 size_t pagemask;
 
diff --git a/src/borg/_hashindex.c b/src/borg/_hashindex.c
index 9fbd1ebda..c7a5b0d0f 100644
--- a/src/borg/_hashindex.c
+++ b/src/borg/_hashindex.c
@@ -71,7 +71,7 @@ static int hash_sizes[] = {
 #define EMPTY _htole32(0xffffffff)
 #define DELETED _htole32(0xfffffffe)
 
-#define BUCKET_ADDR(index, idx) (index->buckets + (idx * index->bucket_size))
+#define BUCKET_ADDR(index, idx) (index->buckets + ((idx) * index->bucket_size))
 
 #define BUCKET_MATCHES_KEY(index, idx, key) (memcmp(key, BUCKET_ADDR(index, idx), index->key_size) == 0)