diff --git a/library.json b/library.json
index f77b31b..59672b0 100644
--- a/library.json
+++ b/library.json
@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "6.4.4",
+  "version": "6.4.5",
   "frameworks": "*",
   "platforms": "*",
   "export": {
diff --git a/src/tiny_event_queue.c b/src/tiny_event_queue.c
index 4b2b801..be33659 100644
--- a/src/tiny_event_queue.c
+++ b/src/tiny_event_queue.c
@@ -69,7 +69,7 @@ static void enqueue_with_data(
   reinterpret(self, _self, tiny_event_queue_t*);
   unsigned capacity = tiny_ring_buffer_capacity(&self->ring_buffer);
   unsigned count = tiny_ring_buffer_count(&self->ring_buffer);
-  unsigned event_size = event_with_data_overhead + data_size;
+  unsigned event_size = (unsigned)(event_with_data_overhead + data_size);
 
   if((capacity - count) <= event_size) {
     self->unable_to_queue_callback();
diff --git a/src/tiny_hsm.c b/src/tiny_hsm.c
index 7b5338b..ae522c4 100644
--- a/src/tiny_hsm.c
+++ b/src/tiny_hsm.c
@@ -49,7 +49,7 @@ static void send_entries(tiny_hsm_t* self, tiny_hsm_state_t after, tiny_hsm_stat
     return;
   }
 
-  for(uint8_t n = distance_between(self, to, after) - 1; n > 0; n--) {
+  for(uint8_t n = (uint8_t)(distance_between(self, to, after) - 1); n > 0; n--) {
     nth_parent(self, to, n)(self, tiny_hsm_signal_entry, NULL);
   }
 
diff --git a/src/tiny_ram_key_value_store.c b/src/tiny_ram_key_value_store.c
index 12bc4b4..31e72ba 100644
--- a/src/tiny_ram_key_value_store.c
+++ b/src/tiny_ram_key_value_store.c
@@ -57,7 +57,7 @@ static const i_tiny_key_value_store_api_t api = {
 
 static void initialize_storage(tiny_ram_key_value_store_t* self)
 {
-  tiny_key_value_store_key_t last_key = self->configuration->key_value_pair_count - 1;
+  tiny_key_value_store_key_t last_key = (tiny_key_value_store_key_t)(self->configuration->key_value_pair_count - 1);
   uint16_t last_offset = offset(self, last_key);
   uint8_t last_size = size(&self->interface, last_key);
   memset(self->storage, 0, last_offset + last_size);