diff --git a/lib/Display/OLEDDisplayUi.h b/lib/Display/OLEDDisplayUi.h
index abba761..2b45147 100644
--- a/lib/Display/OLEDDisplayUi.h
+++ b/lib/Display/OLEDDisplayUi.h
@@ -164,7 +164,7 @@ class OLEDDisplayUi {
 
   public:
 
-    OLEDDisplayUi(OLEDDisplay *display);
+    explicit OLEDDisplayUi(OLEDDisplay *display);
 
     /**
      * Initialise the display
diff --git a/lib/Display/SSD1306.h b/lib/Display/SSD1306.h
index 4d0d4e1..b0ac1be 100644
--- a/lib/Display/SSD1306.h
+++ b/lib/Display/SSD1306.h
@@ -63,7 +63,7 @@ class SSD1306Wire : public OLEDDisplay {
      * @param _i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
      * @param _frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
      */
-    SSD1306Wire(uint8_t _address, int _sda = -1, int _scl = -1, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64, HW_I2C _i2cBus = I2C_ONE, int _frequency = 700000) {
+    explicit SSD1306Wire(uint8_t _address, int _sda = -1, int _scl = -1, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64, HW_I2C _i2cBus = I2C_ONE, int _frequency = 700000) {
       setGeometry(g);
 
       this->_address = _address;
@@ -73,7 +73,7 @@ class SSD1306Wire : public OLEDDisplay {
       this->_frequency = _frequency;
     }
 
-    bool connect() {
+    bool connect() override {
       // On ESP32 arduino, -1 means 'don't change pins', someone else has called begin for us.
       if(this->_sda != -1)
         _wire->begin(this->_sda, this->_scl);
@@ -84,7 +84,7 @@ class SSD1306Wire : public OLEDDisplay {
       return true;
     }
 
-    void display(void) {
+    void display(void) override {
       initI2cIfNeccesary();
       const int x_offset = (128 - this->width()) / 2;
       #ifdef OLEDDISPLAY_DOUBLE_BUFFER
@@ -173,10 +173,10 @@ class SSD1306Wire : public OLEDDisplay {
     }
 
   private:
-	int getBufferOffset(void) {
+	int getBufferOffset(void) override {
 		return 0;
 	}
-    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
+    inline void sendCommand(uint8_t command) __attribute__((always_inline)) override {
       initI2cIfNeccesary();
       _wire->beginTransmission(_address);
       _wire->write(0x80);
diff --git a/lib/TaskManager/TaskManager.cpp b/lib/TaskManager/TaskManager.cpp
index 216712d..8f52e6c 100644
--- a/lib/TaskManager/TaskManager.cpp
+++ b/lib/TaskManager/TaskManager.cpp
@@ -12,14 +12,15 @@ void TaskManager::addTask(std::shared_ptr<Task> task)
 
 std::shared_ptr<Task> TaskManager::getTask(const char * name)
 {
-	for(std::shared_ptr<Task> & elem : _tasks)
+	std::_List_iterator<std::shared_ptr<Task>> elem = std::find_if(_tasks.begin(), _tasks.end(), [&](std::shared_ptr<Task> task)
 	{
-		if(elem->getName() == name)
-		{
-			return elem;
-		}
+		return task->getName() == name;
+	});
+	if(elem == _tasks.end())
+	{
+		return 0;
 	}
-	return 0;
+	return *elem;
 }
 
 bool TaskManager::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig)
@@ -50,4 +51,4 @@ bool TaskManager::loop(std::shared_ptr<Configuration> config)
 		}
 	}
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/Task.cpp b/src/Task.cpp
index fd3d9db..6acb4df 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1,6 +1,6 @@
 #include "Task.h"
 
-char const * const getTaskName(TaskNames task)
+/*char const * const getTaskName(TaskNames task)
 {
 	switch (task)
 	{
@@ -23,4 +23,4 @@ char const * const getTaskName(TaskNames task)
 	default:
 		return "error";
 	}
-}
+}*/
diff --git a/src/Task.h b/src/Task.h
index 14b0c5d..149ee27 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -14,7 +14,7 @@ enum TaskNames
 	TaskSize,
 };
 
-char const * const getTaskName(TaskNames task);
+//char const * const getTaskName(TaskNames task);
 
 #define TASK_DISPLAY	"DisplayTask"
 #define TASK_APRS_IS	"AprsIsTask"