diff --git a/src/shared/Sensors/CurrentSensor.h b/src/shared/Sensors/CurrentSensor.h
index 4615e54133b4bb88b623de8d607e1cae609a94f8..de605740d07df203885ce8b499feec89bec3c616 100644
--- a/src/shared/Sensors/CurrentSensor.h
+++ b/src/shared/Sensors/CurrentSensor.h
@@ -38,6 +38,8 @@ class CurrentSensor : public Sensor
 public:
     CurrentSensor() { memset(&current_data, 0, sizeof(CurrentSenseData)); }
 
+    virtual ~CurrentSensor() {}
+    
     bool init() override { return true; }
 
     bool selfTest() override { return true; }
diff --git a/src/shared/Sensors/MPU9255.h b/src/shared/Sensors/MPU9255.h
index 3ad3ea63ab76858fc02d5bb8ff3e45ab9c2fce21..74f6ecc6c0aa1bb7aac5688413dd0b932388030e 100644
--- a/src/shared/Sensors/MPU9255.h
+++ b/src/shared/Sensors/MPU9255.h
@@ -178,7 +178,7 @@ private:
     // ACCELEROMETER
     const float axel_x_offset = 0;     // offset in g, it's to be filled by hand
     const float axel_y_offset = 0;     // offset in g, it's to be filled by hand
-    const float axel_z_offset = 0;     // offset in g, it's to be filled by hand
+    const float axel_z_offset = 0.11;  // offset in g, it's to be filled by hand
 
     // GYROSCOPE
     const float gyro_x_offset = 0;  // default offset in LSB, it will be
diff --git a/src/shared/SystemDiagnostics/SystemData.h b/src/shared/SystemDiagnostics/SystemData.h
index 3d4b1c3dddf0656cef2e021c0b4ed561dc9c29b3..f8e335974ecfc6ce0980bedfa92eb37b3613484f 100644
--- a/src/shared/SystemDiagnostics/SystemData.h
+++ b/src/shared/SystemDiagnostics/SystemData.h
@@ -28,7 +28,7 @@
 
 struct SystemData
 {
-    uint32_t timestamp;
+    long long timestamp;
     float cpuUsage;
     unsigned int currentFreeHeap;
     unsigned int absoluteFreeHeap;
diff --git a/src/shared/SystemDiagnostics/SystemDiagnostics.h b/src/shared/SystemDiagnostics/SystemDiagnostics.h
index f9194eeb9b73f8cc6d4e8151886561401ff71cc9..f3fab405f629a65635db6d5ac113b9609f8564d1 100644
--- a/src/shared/SystemDiagnostics/SystemDiagnostics.h
+++ b/src/shared/SystemDiagnostics/SystemDiagnostics.h
@@ -69,7 +69,7 @@ public:
     {
         if (threadData.empty())
         {
-            return StackData{THREAD_INVALID, 0, 0};
+            return StackData{THREAD_INVALID, 0, 0, 0};
         }
 
         Lock<FastMutex> l(mtxMap);