diff --git a/src/hidpp-generic.c b/src/hidpp-generic.c
index 9862c5c3..15ee135c 100644
--- a/src/hidpp-generic.c
+++ b/src/hidpp-generic.c
@@ -146,7 +146,7 @@ hidpp20_1b04_get_logical_mapping(uint16_t value)
 			return &map->action;
 	}
 
-	return RATBAG_BUTTON_TYPE_UNKNOWN;
+	return NULL;
 }
 
 uint16_t
diff --git a/src/hidpp10.c b/src/hidpp10.c
index 950b1f5e..c3cacd7c 100644
--- a/src/hidpp10.c
+++ b/src/hidpp10.c
@@ -294,8 +294,7 @@ hidpp10_set_individual_feature(struct hidpp10_device *dev,
 
 	log_raw(dev->ratbag_device->ratbag, "Setting individual features\n");
 
-	if (dev)
-		mode.msg.device_idx = dev->index;
+	mode.msg.device_idx = dev->index;
 
 	mode.msg.parameters[0] = feature_bit_r0;
 	mode.msg.parameters[1] = feature_bit_r2;
diff --git a/src/hidpp20.c b/src/hidpp20.c
index d554e061..4779e5a8 100644
--- a/src/hidpp20.c
+++ b/src/hidpp20.c
@@ -779,7 +779,7 @@ hidpp20_adjustable_dpi_get_dpi_list(struct ratbag_device *device,
 	sensor->dpi_min = 0xffff;
 
 	sensor->index = msg.msg.parameters[0];
-	while (i < LONG_MESSAGE_LENGTH - 1 &&
+	while (i < LONG_MESSAGE_LENGTH - 4U &&
 	       hidpp20_get_unaligned_u16(&msg.msg.parameters[i]) != 0) {
 		uint16_t value = hidpp20_get_unaligned_u16(&msg.msg.parameters[i]);