diff --git a/mongoose.c b/mongoose.c
index 49bb1146..8cc50eb3 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3624,8 +3624,8 @@ bool mg_l2_eth_rx(struct mg_tcpip_if *ifp, enum mg_l2proto *proto,
 }
 
 struct mg_l2addr *mg_l2_eth_getaddr(struct mg_tcpip_if *ifp, uint8_t *frame) {
-  (void) ifp;  // address field is before a possible 802.1Q tag
-  struct eth *eth = (struct eth *) frame;
+  struct eth *eth = (struct eth *) frame; 
+  (void) ifp; // address field is before a possible 802.1Q tag
   return (struct mg_l2addr *) &eth->src;
 }
 
diff --git a/src/l2_eth.c b/src/l2_eth.c
index 288155bc..39952251 100644
--- a/src/l2_eth.c
+++ b/src/l2_eth.c
@@ -141,8 +141,8 @@ bool mg_l2_eth_rx(struct mg_tcpip_if *ifp, enum mg_l2proto *proto,
 }
 
 struct mg_l2addr *mg_l2_eth_getaddr(struct mg_tcpip_if *ifp, uint8_t *frame) {
-  (void) ifp;  // address field is before a possible 802.1Q tag
-  struct eth *eth = (struct eth *) frame;
+  struct eth *eth = (struct eth *) frame; 
+  (void) ifp; // address field is before a possible 802.1Q tag
   return (struct mg_l2addr *) &eth->src;
 }
 
diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/sim800-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/sim800-mqtt.ino
index 5d913671..1f872158 100644
--- a/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/sim800-mqtt.ino
+++ b/tutorials/mqtt/mqtt-client/arduino/sim800-mqtt/sim800-mqtt.ino
@@ -28,7 +28,7 @@ static const char *script[] = {
 //SoftwareSerial ModemSerial(RX_PIN, TX_PIN);
 
 struct mg_connection *mqtt_connection;
-struct mg_tcpip_driver_ppp_data driver_data;
+struct mg_tcpip_driver_atcmd_data driver_data;
 struct mg_mgr mgr;                                     // Mongoose event manager
 struct mg_tcpip_if mif = {.mac = {2, 0, 1, 2, 3, 5}};  // Network interface