diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp
index c6ce88c..798b22a 100644
--- a/FlippR-Driver/src/input/Detector.cpp
+++ b/FlippR-Driver/src/input/Detector.cpp
@@ -16,7 +16,7 @@ namespace flippR_driver
 namespace input
 {
 
-Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>>& events) :
+Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>> events) :
   input_gpio_interface(std::move(input_gpio_interface)), events(std::move(events)), is_running(true)
 {
   this->detect_thread = std::thread(&Detector::detect, this);
diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h
index 55ddcf2..93ccb4d 100644
--- a/FlippR-Driver/src/input/Detector.h
+++ b/FlippR-Driver/src/input/Detector.h
@@ -34,8 +34,8 @@ class Detector : public IDetector
 {
 
 public:
-  Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>>& events);
-  ~Detector();
+  Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>> events);
+  ~Detector() override;
 
 private:
   void detect();
diff --git a/FlippR-Driver/src/input/DistributingEvent.cpp b/FlippR-Driver/src/input/DistributingEvent.cpp
index 25603de..248706a 100644
--- a/FlippR-Driver/src/input/DistributingEvent.cpp
+++ b/FlippR-Driver/src/input/DistributingEvent.cpp
@@ -23,7 +23,7 @@ void flippR_driver::input::DistributingEvent::active()
   {
     if(activation_state != ACTIVATED)
     {
-      activation_state = static_cast<ActivationState>(static_cast<int>(activation_state) + 1);
+      activation_state = activation_state == NOT_ACTIVATED ? FIRST_ACTIVATED : ACTIVATED;
     }
 
     last_activation = std::chrono::high_resolution_clock::now();
diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h
index f403272..af0ec19 100644
--- a/FlippR-Driver/src/output/DisplayController.h
+++ b/FlippR-Driver/src/output/DisplayController.h
@@ -25,7 +25,7 @@ class DisplayController : public IDisplayController
 {
 public:
 	explicit DisplayController(std::vector<std::shared_ptr<items::IDisplay>> displays, std::shared_ptr<IOutputGPIOInterface> output_gpio_interface);
-	~DisplayController();
+	~DisplayController() override;
 
 private:
 	void cycle_displays();