diff --git a/firmware/mcal/raspi/periph/can.h b/firmware/mcal/raspi/periph/can.h
index 9527a2f3..e88be22d 100644
--- a/firmware/mcal/raspi/periph/can.h
+++ b/firmware/mcal/raspi/periph/can.h
@@ -101,7 +101,8 @@ class CanBase : public shared::periph::CanBase {
     std::chrono::steady_clock::time_point program_start_;
 
     inline uint32_t get_tick() {
-        std::chrono::milliseconds elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
+        std::chrono::milliseconds elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::steady_clock::now() - start);
         return static_cast<uint32_t>(elapsed_ms.count());
     }
 
diff --git a/firmware/shared/comms/can/raw_can_msg.h b/firmware/shared/comms/can/raw_can_msg.h
index b0cac4f4..1e66e659 100644
--- a/firmware/shared/comms/can/raw_can_msg.h
+++ b/firmware/shared/comms/can/raw_can_msg.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <sys/_stdint.h>
 
 #include <algorithm>
 #include <iostream>