diff --git a/lib/PowerManagement/power_management.cpp b/lib/PowerManagement/power_management.cpp
index e81e6bf..f93a7a1 100644
--- a/lib/PowerManagement/power_management.cpp
+++ b/lib/PowerManagement/power_management.cpp
@@ -1,7 +1,7 @@
 
 #include "power_management.h"
 
-PowerManagement::PowerManagement() {
+PowerManagement::PowerManagement() : axp() {
 }
 
 bool PowerManagement::begin(TwoWire &port) {
diff --git a/src/TaskAprsIs.cpp b/src/TaskAprsIs.cpp
index 16ac6be..81089e0 100644
--- a/src/TaskAprsIs.cpp
+++ b/src/TaskAprsIs.cpp
@@ -30,9 +30,11 @@ bool AprsIsTask::loop(System &system) {
     return false;
   }
 
-  std::shared_ptr<APRSMessage> msg = _aprs_is.getAPRSMessage();
-  if (msg) {
-    _toModem.addElement(msg);
+  {
+    std::shared_ptr<APRSMessage> msg = _aprs_is.getAPRSMessage();
+    if (msg) {
+      _toModem.addElement(msg);
+    }
   }
 
   if (!_toAprsIs.empty()) {
diff --git a/src/TaskMQTT.h b/src/TaskMQTT.h
index d388075..082ec2e 100644
--- a/src/TaskMQTT.h
+++ b/src/TaskMQTT.h
@@ -8,7 +8,7 @@
 
 class MQTTTask : public Task {
 public:
-  MQTTTask(TaskQueue<std::shared_ptr<APRSMessage>> &toMQTT);
+  explicit MQTTTask(TaskQueue<std::shared_ptr<APRSMessage>> &toMQTT);
   virtual ~MQTTTask();
 
   virtual bool setup(System &system) override;