diff --git a/src/main.cpp b/src/main.cpp
index 2f4b12437..28842734c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -245,7 +245,7 @@ const char *getDeviceName()
 uint32_t timeLastPowered = 0;
 
 static OSThread *powerFSMthread;
-OSThread *ambientLightingThread;
+AmbientLightingThread *ambientLightingThread;
 
 RadioLibHal *RadioLibHAL = NULL;
 
diff --git a/src/mesh/PacketHistory.cpp b/src/mesh/PacketHistory.cpp
index b56ce57c9..f5c36b083 100644
--- a/src/mesh/PacketHistory.cpp
+++ b/src/mesh/PacketHistory.cpp
@@ -9,8 +9,8 @@
 #include "Throttle.h"
 
 #define PACKETHISTORY_MAX                                                                                                        \
-    max((u_int32_t)(MAX_NUM_NODES * 2.0),                                                                                        \
-        (u_int32_t)100) // x2..3  Should suffice. Empirical setup. 16B per record malloc'ed, but no less than 100
+    max((uint32_t)(MAX_NUM_NODES * 2.0),                                                                                         \
+        (uint32_t)100) // x2..3  Should suffice. Empirical setup. 16B per record malloc'ed, but no less than 100
 
 #define RECENT_WARN_AGE (10 * 60 * 1000L) // Warn if the packet that gets removed was more recent than 10 min