diff --git a/edac/CRC.cpp b/edac/CRC.cpp
index 096ec6ef..5729d4d8 100644
--- a/edac/CRC.cpp
+++ b/edac/CRC.cpp
@@ -214,7 +214,7 @@ void CRC::encodeFiveBit(const bool* in, uint32_t& tcrc)
 {
     assert(in != NULL);
 
-    unsigned short total = 0U;
+    uint16_t total = 0U;
     for (uint32_t i = 0U; i < 72U; i += 8U) {
         uint8_t c;
         Utils::bitsToByteBE(in + i, c);
diff --git a/host/calibrate/HostCal.cpp b/host/calibrate/HostCal.cpp
index 4992623c..fb9b2946 100644
--- a/host/calibrate/HostCal.cpp
+++ b/host/calibrate/HostCal.cpp
@@ -669,9 +669,9 @@ bool HostCal::portModemHandler(Modem* modem, uint32_t ms, RESP_TYPE_DVM rspType,
         break;
         case CMD_RSSI_DATA:
         {
-            unsigned short max = buffer[3U] << 8 | buffer[4U];
-            unsigned short min = buffer[5U] << 8 | buffer[6U];
-            unsigned short ave = buffer[7U] << 8 | buffer[8U];
+            uint16_t max = buffer[3U] << 8 | buffer[4U];
+            uint16_t min = buffer[5U] << 8 | buffer[6U];
+            uint16_t ave = buffer[7U] << 8 | buffer[8U];
             LogMessage(LOG_CAL, "RSSI: max: %u, min: %u, ave: %u", max, min, ave);
         }
         break;
diff --git a/network/BaseNetwork.h b/network/BaseNetwork.h
index d9b19dbf..49cb1fa8 100644
--- a/network/BaseNetwork.h
+++ b/network/BaseNetwork.h
@@ -248,7 +248,7 @@ namespace network
         bool m_debug;
 
         sockaddr_storage m_addr;
-        unsigned int m_addrLen;
+        uint32_t m_addrLen;
         UDPSocket m_socket;
         NET_CONN_STATUS m_status;