diff --git a/features/lorawan/LoRaWANBase.h b/features/lorawan/LoRaWANBase.h
index 02397f3b49..40fe483923 100644
--- a/features/lorawan/LoRaWANBase.h
+++ b/features/lorawan/LoRaWANBase.h
@@ -342,7 +342,7 @@ public:
      *                          LORAWAN_STATUS_UNSUPPORTED is requested class is not supported,
      *                          or other negative error code if request failed.
      */
-    virtual lorawan_status_t set_device_class(const device_class_t device_class) = 0;
+    virtual lorawan_status_t set_device_class(device_class_t device_class) = 0;
 };
 
 #endif /* LORAWAN_BASE_H_ */
diff --git a/features/lorawan/LoRaWANStack.cpp b/features/lorawan/LoRaWANStack.cpp
index 803e13fbab..0eee8876b7 100644
--- a/features/lorawan/LoRaWANStack.cpp
+++ b/features/lorawan/LoRaWANStack.cpp
@@ -131,29 +131,29 @@ lorawan_status_t LoRaWANStack::connect()
     lorawan_connect_t connection_params;
 
     //TODO: LoRaWANStack don't need to know these values, move to LoRaMac (or below)
-#if (1 == MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION)
-    static uint8_t dev_eui[] = MBED_CONF_LORA_DEVICE_EUI;
-    static uint8_t app_eui[] = MBED_CONF_LORA_APPLICATION_EUI;
-    static uint8_t app_key[] = MBED_CONF_LORA_APPLICATION_KEY;
+#if MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION
+    const static uint8_t dev_eui[] = MBED_CONF_LORA_DEVICE_EUI;
+    const static uint8_t app_eui[] = MBED_CONF_LORA_APPLICATION_EUI;
+    const static uint8_t app_key[] = MBED_CONF_LORA_APPLICATION_KEY;
 
     connection_params.connect_type = LORAWAN_CONNECTION_OTAA;
-    connection_params.connection_u.otaa.app_eui = app_eui;
-    connection_params.connection_u.otaa.dev_eui = dev_eui;
-    connection_params.connection_u.otaa.app_key = app_key;
+    connection_params.connection_u.otaa.app_eui = const_cast<uint8_t *>(app_eui);
+    connection_params.connection_u.otaa.dev_eui = const_cast<uint8_t *>(dev_eui);
+    connection_params.connection_u.otaa.app_key = const_cast<uint8_t *>(app_key);
     connection_params.connection_u.otaa.nb_trials = MBED_CONF_LORA_NB_TRIALS;
 
     return join_request_by_otaa(connection_params);
 #else
-    static uint8_t nwk_skey[] = MBED_CONF_LORA_NWKSKEY;
-    static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY;
-    static uint32_t dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS;
-    static uint32_t nwk_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK);
+    const static uint8_t nwk_skey[] = MBED_CONF_LORA_NWKSKEY;
+    const static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY;
+    const static uint32_t dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS;
+    const static uint32_t nwk_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK);
 
     connection_params.connect_type = LORAWAN_CONNECTION_ABP;
-    connection_params.connection_u.abp.nwk_id = nwk_id;
-    connection_params.connection_u.abp.dev_addr = dev_addr;
-    connection_params.connection_u.abp.nwk_skey = nwk_skey;
-    connection_params.connection_u.abp.app_skey = app_skey;
+    connection_params.connection_u.abp.nwk_id = const_cast<uint8_t *>(nwk_id);
+    connection_params.connection_u.abp.dev_addr = const_cast<uint8_t *>(dev_addr);
+    connection_params.connection_u.abp.nwk_skey = const_cast<uint8_t *>(nwk_skey);
+    connection_params.connection_u.abp.app_skey = const_cast<uint8_t *>(app_skey);
 
     return activation_by_personalization(connection_params);
 #endif
diff --git a/features/lorawan/lorastack/phy/LoRaPHY.cpp b/features/lorawan/lorastack/phy/LoRaPHY.cpp
index 949976ba96..368ecfed2f 100644
--- a/features/lorawan/lorastack/phy/LoRaPHY.cpp
+++ b/features/lorawan/lorastack/phy/LoRaPHY.cpp
@@ -651,19 +651,20 @@ bool LoRaPHY::verify_rx_datarate(uint8_t datarate)
 
 bool LoRaPHY::verify_tx_datarate(uint8_t datarate, bool use_default)
 {
-    if (is_datarate_supported(datarate)) {
-        if (use_default) {
-            return val_in_range(datarate, phy_params.default_datarate,
-                                phy_params.default_max_datarate);
-        } else if (phy_params.ul_dwell_time_setting == 0) {
-            return val_in_range(datarate, phy_params.min_tx_datarate,
-                                phy_params.max_tx_datarate);
-        } else {
-            return val_in_range(datarate, phy_params.dwell_limit_datarate,
-                                phy_params.max_tx_datarate);
-        }
+    if (!is_datarate_supported(datarate)) {
+        return false;
+    }
+
+    if (use_default) {
+        return val_in_range(datarate, phy_params.default_datarate,
+                            phy_params.default_max_datarate);
+    } else if (phy_params.ul_dwell_time_setting == 0) {
+        return val_in_range(datarate, phy_params.min_tx_datarate,
+                            phy_params.max_tx_datarate);
+    } else {
+        return val_in_range(datarate, phy_params.dwell_limit_datarate,
+                            phy_params.max_tx_datarate);
     }
-    return false;
 }
 
 bool LoRaPHY::verify_tx_power(uint8_t tx_power)
diff --git a/features/lorawan/system/lorawan_data_structures.h b/features/lorawan/system/lorawan_data_structures.h
index 446157c4cb..be47685b64 100644
--- a/features/lorawan/system/lorawan_data_structures.h
+++ b/features/lorawan/system/lorawan_data_structures.h
@@ -1744,7 +1744,7 @@ typedef struct {
 
 typedef struct {
     /*!
-     * Compiliance test request
+     * Compliance test request
      */
     mcps_type_t type;