diff --git a/src/ArduinoIoTCloud.cpp b/src/ArduinoIoTCloud.cpp
index 0b2794ade..0d9102d67 100644
--- a/src/ArduinoIoTCloud.cpp
+++ b/src/ArduinoIoTCloud.cpp
@@ -32,8 +32,8 @@ ArduinoIoTCloudClass::ArduinoIoTCloudClass()
 , _tz_offset{0}
 , _tz_dst_until{0}
 , _thing_id{""}
-, _device_id{""}
 , _lib_version{AIOT_CONFIG_LIB_VERSION}
+, _device_id{""}
 , _cloud_event_callback{nullptr}
 , _thing_id_outdated{false}
 {
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
index 4d08e4a36..5aab44f95 100644
--- a/src/ArduinoIoTCloudTCP.cpp
+++ b/src/ArduinoIoTCloudTCP.cpp
@@ -387,7 +387,10 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SyncTime()
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
   unsigned long const internal_posix_time = _time_service.getTime();
+#pragma GCC diagnostic pop
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);
   return State::ConnectMqttBroker;
 }
diff --git a/src/cbor/lib/tinycbor/src/open_memstream.c b/src/cbor/lib/tinycbor/src/open_memstream.c
index 707dbb1c4..4d79a726e 100644
--- a/src/cbor/lib/tinycbor/src/open_memstream.c
+++ b/src/cbor/lib/tinycbor/src/open_memstream.c
@@ -46,6 +46,7 @@ typedef size_t LenType;
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
 #pragma GCC diagnostic ignored "-Wreturn-type"
+#pragma GCC diagnostic ignored "-Wunused-function"
 
 struct Buffer
 {
diff --git a/src/utility/watchdog/Watchdog.cpp b/src/utility/watchdog/Watchdog.cpp
index 8e91b1ecd..7fdbbd347 100644
--- a/src/utility/watchdog/Watchdog.cpp
+++ b/src/utility/watchdog/Watchdog.cpp
@@ -41,8 +41,9 @@
 /******************************************************************************
  * GLOBAL VARIABLES
  ******************************************************************************/
-
+#if defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_MBED)
 static bool is_watchdog_enabled = false;
+#endif
 
 /******************************************************************************
  * FUNCTION DEFINITION