diff --git a/src/borg/_hashindex.c b/src/borg/_hashindex.c
index dd3b1c323..7236cfdce 100644
--- a/src/borg/_hashindex.c
+++ b/src/borg/_hashindex.c
@@ -118,7 +118,7 @@ static void hashindex_write(HashIndex *index, PyObject *file_py);
 static uint64_t hashindex_compact(HashIndex *index);
 static HashIndex *hashindex_init(int capacity, int key_size, int value_size);
 static const unsigned char *hashindex_get(HashIndex *index, const unsigned char *key);
-static int hashindex_set(HashIndex *index, const unsigned char *key, const unsigned char *value);
+static int hashindex_set(HashIndex *index, const unsigned char *key, const void *value);
 static int hashindex_delete(HashIndex *index, const unsigned char *key);
 static unsigned char *hashindex_next_key(HashIndex *index, const unsigned char *key);
 
@@ -559,7 +559,7 @@ hashindex_get(HashIndex *index, const unsigned char *key)
 }
 
 static int
-hashindex_set(HashIndex *index, const unsigned char *key, const unsigned char *value)
+hashindex_set(HashIndex *index, const unsigned char *key, const void *value)
 {
     int start_idx;
     int idx = hashindex_lookup(index, key, &start_idx);
diff --git a/src/borg/cache_sync/unpack.h b/src/borg/cache_sync/unpack.h
index a185fe784..f6dd9ca8e 100644
--- a/src/borg/cache_sync/unpack.h
+++ b/src/borg/cache_sync/unpack.h
@@ -102,7 +102,7 @@ typedef struct unpack_user {
 
     /* collect values here for current chunklist entry */
     struct {
-        char key[32];
+        unsigned char key[32];
         uint32_t csize;
         uint32_t size;
     } current;