diff --git a/epicardium/modules/bhi.c b/epicardium/modules/bhi.c
index b04d2fd5c50ad62ec0294f366958f2af932cb0a8..4e38306e4e6616f36b48f1ad6f411ad3d3377cff 100644
--- a/epicardium/modules/bhi.c
+++ b/epicardium/modules/bhi.c
@@ -227,7 +227,7 @@ out_free_i2c:
 
 void epic_bhi160_disable_all_sensors()
 {
-	for (int i = 0; i < sizeof(bhi160_sensor_active); i++) {
+	for (size_t i = 0; i < sizeof(bhi160_sensor_active); i++) {
 		if (bhi160_sensor_active[i]) {
 			epic_bhi160_disable_sensor(i);
 		}
diff --git a/epicardium/modules/personal_state.c b/epicardium/modules/personal_state.c
index cd6c52c7471af09a37560ef4b94644fc0549179c..e1990f2b8d80fee987676af3b937e35d0faca51f 100644
--- a/epicardium/modules/personal_state.c
+++ b/epicardium/modules/personal_state.c
@@ -18,7 +18,7 @@ int personal_state_enabled()
 
 int epic_personal_state_set(uint8_t state, bool persistent)
 {
-	if (state < STATE_NONE || state > STATE_CAMP)
+	if (state > STATE_CAMP)
 		return -EINVAL;
 
 	led_animation_state = 0;
diff --git a/epicardium/modules/sleep.c b/epicardium/modules/sleep.c
index a87bcb0ce47cc601c96b67c247a32b933cb09393..70cc35c5528a8403f0858d540ddea195e6893b33 100644
--- a/epicardium/modules/sleep.c
+++ b/epicardium/modules/sleep.c
@@ -142,8 +142,7 @@ static void gpio_low_power(void)
 
 	const unsigned int num_pins =
 		(sizeof(pins_low_power) / sizeof(gpio_cfg_t));
-	int i;
-	for (i = 0; i < num_pins; i++) {
+	for (size_t i = 0; i < num_pins; i++) {
 		GPIO_OutClr(&pins_low_power[i]);
 		GPIO_Config(&pins_low_power[i]);
 	}