diff --git a/library.properties b/library.properties
index 3fb5182..be568a3 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=STM32duino VL53L1
-version=2.0.1
+version=2.0.2
 author=SRA
 maintainer=stm32duino
 sentence=Allows controlling the VL53L1 (Time-of-Flight)
diff --git a/src/vl53l1_class.cpp b/src/vl53l1_class.cpp
index 66b500e..3d0795c 100644
--- a/src/vl53l1_class.cpp
+++ b/src/vl53l1_class.cpp
@@ -3830,7 +3830,7 @@ VL53L1_Error VL53L1::VL53L1_I2CWrite(uint8_t DeviceAddr, uint16_t RegisterAddr,
   Serial.print("Writing port number ");
   Serial.println(RegisterAddr);
 #endif
-  const uint8_t buffer[2] {RegisterAddr >> 8, RegisterAddr & 0xFF };
+  const uint8_t buffer[2] {(uint8_t)(RegisterAddr >> 8), (uint8_t)(RegisterAddr & 0xFF)};
   dev_i2c->write(buffer, 2);
   for (int i = 0 ; i < NumByteToWrite ; i++) {
     dev_i2c->write(pBuffer[i]);
@@ -3854,7 +3854,7 @@ VL53L1_Error VL53L1::VL53L1_I2CRead(uint8_t DeviceAddr, uint16_t RegisterAddr, u
     Serial.print("Reading port number ");
     Serial.println(RegisterAddr);
 #endif
-    const uint8_t buffer[2] {RegisterAddr >> 8, RegisterAddr & 0xFF };
+    const uint8_t buffer[2] {(uint8_t)(RegisterAddr >> 8), (uint8_t)(RegisterAddr & 0xFF)};
     dev_i2c->write(buffer, 2);
     status = dev_i2c->endTransmission(false);
     //Fix for some STM32 boards
@@ -3907,7 +3907,7 @@ VL53L1_Error VL53L1::VL53L1_WaitValueMaskEx(VL53L1_Dev_t *pdev, uint32_t timeout
    */
 
   VL53L1_Error status         = VL53L1_ERROR_NONE;
-  const auto   start_time_ms   = millis();
+  uint32_t     start_time_ms   = millis();
   uint32_t     polling_time_ms = 0;
   uint8_t      byte_value      = 0;
   uint8_t      found           = 0;
@@ -3942,7 +3942,7 @@ VL53L1_Error VL53L1::VL53L1_WaitValueMaskEx(VL53L1_Dev_t *pdev, uint32_t timeout
 
     /* Update polling time (Compare difference rather than absolute to
        negate 32bit wrap around issue) */
-    polling_time_ms = static_cast<std::uint32_t>(millis() - start_time_ms);
+    polling_time_ms = (uint32_t)(millis() - start_time_ms);
 
   }
 
diff --git a/src/vl53l1_wait.cpp b/src/vl53l1_wait.cpp
index 9173c46..b1a2005 100644
--- a/src/vl53l1_wait.cpp
+++ b/src/vl53l1_wait.cpp
@@ -425,7 +425,7 @@ VL53L1_Error VL53L1::VL53L1_poll_for_firmware_ready(
   VL53L1_Error status          = VL53L1_ERROR_NONE;
   VL53L1_LLDriverData_t *pdev = VL53L1DevStructGetLLDriverHandle(Dev);
 
-  const auto   start_time_ms   = millis();
+  uint32_t     start_time_ms   = millis();
   int32_t      poll_delay_ms   = VL53L1_POLLING_DELAY_MS;
   uint8_t      fw_ready        = 0;
 
@@ -451,7 +451,7 @@ VL53L1_Error VL53L1::VL53L1_poll_for_firmware_ready(
 
 
     pdev->fw_ready_poll_duration_ms =
-      static_cast<std::uint32_t>(millis() - start_time_ms);
+      (uint32_t)(millis() - start_time_ms);
   }
 
   if (fw_ready == 0 && status == VL53L1_ERROR_NONE) {