diff --git a/common/io/SelectServerTest.cpp b/common/io/SelectServerTest.cpp
index 6e905c2acc..51d39d9a5a 100644
--- a/common/io/SelectServerTest.cpp
+++ b/common/io/SelectServerTest.cpp
@@ -122,7 +122,9 @@ class SelectServerTest: public CppUnit::TestFixture {
 
   void Terminate() {
     OLA_DEBUG << "Terminate called";
-    if (m_ss) { m_ss->Terminate(); }
+    if (m_ss) {
+      m_ss->Terminate();
+    }
   }
 
   void SingleIncrementTimeout() {
@@ -147,8 +149,9 @@ class SelectServerTest: public CppUnit::TestFixture {
   void NullHandler() {}
 
   bool IncrementTimeout() {
-    if (m_ss && m_ss->IsRunning())
+    if (m_ss && m_ss->IsRunning()) {
       m_timeout_counter++;
+    }
     return true;
   }
 
diff --git a/common/testing/GenericTester.cpp b/common/testing/GenericTester.cpp
index 19c8d0b26e..0728b6fc45 100644
--- a/common/testing/GenericTester.cpp
+++ b/common/testing/GenericTester.cpp
@@ -25,6 +25,7 @@
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+#include <iostream>
 #include <string>
 
 #include "ola/base/Env.h"
diff --git a/doxygen/examples/callback_client_transmit.cpp b/doxygen/examples/callback_client_transmit.cpp
index 2f8c9fa721..e5aa943f99 100644
--- a/doxygen/examples/callback_client_transmit.cpp
+++ b/doxygen/examples/callback_client_transmit.cpp
@@ -22,6 +22,8 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;
 
diff --git a/doxygen/examples/client_disconnect.cpp b/doxygen/examples/client_disconnect.cpp
index 1d2b9bffb1..2e8566cf9d 100644
--- a/doxygen/examples/client_disconnect.cpp
+++ b/doxygen/examples/client_disconnect.cpp
@@ -23,6 +23,8 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;
 
diff --git a/doxygen/examples/client_thread.cpp b/doxygen/examples/client_thread.cpp
index 96aaa122c1..10415c24b3 100644
--- a/doxygen/examples/client_thread.cpp
+++ b/doxygen/examples/client_thread.cpp
@@ -22,6 +22,7 @@
 #include <ola/thread/Thread.h>
 #include <ola/Callback.h>
 
+#include <iostream>
 #include <vector>
 
 #ifdef _WIN32
diff --git a/doxygen/examples/fetch_plugins.cpp b/doxygen/examples/fetch_plugins.cpp
index 562542ccd0..78a7e5c76f 100644
--- a/doxygen/examples/fetch_plugins.cpp
+++ b/doxygen/examples/fetch_plugins.cpp
@@ -21,6 +21,7 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
 #include <vector>
 
 using std::cout;
diff --git a/doxygen/examples/legacy_callback_client_transmit.cpp b/doxygen/examples/legacy_callback_client_transmit.cpp
index 30d090cfdd..5279cf218a 100644
--- a/doxygen/examples/legacy_callback_client_transmit.cpp
+++ b/doxygen/examples/legacy_callback_client_transmit.cpp
@@ -22,6 +22,8 @@
 #include <ola/OlaClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;
 
diff --git a/examples/ola-dmxconsole.cpp b/examples/ola-dmxconsole.cpp
index 5b2de06862..57642cb203 100644
--- a/examples/ola-dmxconsole.cpp
+++ b/examples/ola-dmxconsole.cpp
@@ -56,6 +56,7 @@
 #include <ola/client/OlaClient.h>
 #include <ola/io/SelectServer.h>
 
+#include <iostream>
 #include <string>
 
 using ola::client::OlaClient;
diff --git a/include/ola/thread/FuturePrivate.h b/include/ola/thread/FuturePrivate.h
index e2f065fb9f..56bda87155 100644
--- a/include/ola/thread/FuturePrivate.h
+++ b/include/ola/thread/FuturePrivate.h
@@ -89,7 +89,7 @@ class FutureImpl {
   bool m_is_set;
   T m_value;
 
-  DISALLOW_COPY_AND_ASSIGN(FutureImpl<T>);
+  DISALLOW_COPY_AND_ASSIGN(FutureImpl);
 };
 
 /**
@@ -152,7 +152,7 @@ class FutureImpl<void> {
   unsigned int m_ref_count;
   bool m_is_set;
 
-  DISALLOW_COPY_AND_ASSIGN(FutureImpl<void>);
+  DISALLOW_COPY_AND_ASSIGN(FutureImpl);
 };
 
 }  // namespace thread
diff --git a/libs/usb/JaRuleWidgetPort.cpp b/libs/usb/JaRuleWidgetPort.cpp
index c130732f82..ff69f7f71b 100644
--- a/libs/usb/JaRuleWidgetPort.cpp
+++ b/libs/usb/JaRuleWidgetPort.cpp
@@ -28,6 +28,7 @@
 #include <ola/thread/Mutex.h>
 #include <ola/util/Utils.h>
 
+#include <iostream>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/plugins/usbdmx/WidgetFactory.h b/plugins/usbdmx/WidgetFactory.h
index fc65600f3d..1231404e48 100644
--- a/plugins/usbdmx/WidgetFactory.h
+++ b/plugins/usbdmx/WidgetFactory.h
@@ -172,7 +172,7 @@ class BaseWidgetFactory : public WidgetFactory {
  private:
   const std::string m_name;
 
-  DISALLOW_COPY_AND_ASSIGN(BaseWidgetFactory<WidgetType>);
+  DISALLOW_COPY_AND_ASSIGN(BaseWidgetFactory);
 };
 
 template <typename WidgetType>
diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py
index 4e724d4e1a..c12baa78bb 100644
--- a/tools/rdm/TestDefinitions.py
+++ b/tools/rdm/TestDefinitions.py
@@ -269,7 +269,6 @@ class DUBSingleLowerUID(TestMixins.DiscoveryMixin,
                         ResponderTestFixture):
   """DUB from <UID> - 1 to <UID> - 1."""
   CATEGORY = TestCategory.NETWORK_MANAGEMENT
-  CATEGORY = TestCategory.NETWORK_MANAGEMENT
   REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES
 
   def LowerBound(self):
@@ -286,7 +285,6 @@ class DUBSingleUpperUID(TestMixins.DiscoveryMixin,
                         ResponderTestFixture):
   """DUB from <UID> + 1 to <UID> + 1."""
   CATEGORY = TestCategory.NETWORK_MANAGEMENT
-  CATEGORY = TestCategory.NETWORK_MANAGEMENT
   REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES
 
   def LowerBound(self):