diff --git a/fw/Core/Src/main.c b/fw/Core/Src/main.c
index 5841d46..75d5fed 100644
--- a/fw/Core/Src/main.c
+++ b/fw/Core/Src/main.c
@@ -103,8 +103,8 @@ enum
 } identification_registers_numbers;
 
 /* Variables to store the measured data */
-int CO2, T_SCD4x, RH_SCD4x;
-int T_SHT4x, RH_SHT4x;
+int16_t T_SCD4x, T_SHT4x;
+uint16_t CO2, RH_SCD4x, RH_SHT4x;
 uint16_t sps30_measured_data[10];
 
 /* Struct to store the sensor config */
diff --git a/fw/Core/Src/scd4x.c b/fw/Core/Src/scd4x.c
index a0494d5..c8ab1d0 100644
--- a/fw/Core/Src/scd4x.c
+++ b/fw/Core/Src/scd4x.c
@@ -44,7 +44,7 @@ int8_t scd4x_perform_factory_reset( void )
 	return scd4x_send_cmd(SCD4X_PERFORM_FACTORY_RESET);
 }
 
-int8_t scd4x_read_measurement(uint16_t * co2, int16_t *temperature, uint16_t *relative_humidity)
+int8_t scd4x_read_measurement(uint16_t *co2, int16_t *temperature, uint16_t *relative_humidity)
 {
 	uint8_t buffer[32];
 	int result;