diff --git a/src/dv/Control/main.c b/src/dv/Control/main.c
index 28844c0e14982f711c387227e49f078b8436e4db..194e856871c4c66e9b823ca5740e71d277030ede 100644
--- a/src/dv/Control/main.c
+++ b/src/dv/Control/main.c
@@ -35,7 +35,7 @@
 
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>q
+#include <sys/wait.h>
 
 /* Action Table */
 
diff --git a/src/pub_sub_stream/tests/test_dc_stats.cc b/src/pub_sub_stream/tests/test_dc_stats.cc
index c775f0dc3d4ccc4509f500a7dcc28e2570e7cd50..8f1b3138f7e32deb62349a1c97a5a3d0bb5cefa6 100644
--- a/src/pub_sub_stream/tests/test_dc_stats.cc
+++ b/src/pub_sub_stream/tests/test_dc_stats.cc
@@ -16,31 +16,29 @@
 
 namespace
 {
+    DCUStats
+    make_stats( int          config_crc,
+                unsigned int status,
+                int          crc_per_sec,
+                int          crc_sum,
+                std::string  model_name )
+    {
+        DCUStats d;
+        d.expected_config_crc = config_crc;
+        d.status = status;
+        d.crc_per_sec = crc_per_sec;
+        d.crc_sum = crc_sum;
+        d.full_model_name = std::move( model_name );
+        return d;
+    }
+
     std::vector< DCUStats >
     basic_dcus( )
     {
         std::vector< DCUStats > dcus;
-        dcus.emplace_back( DCUStats{
-            0,
-            0,
-            0,
-            0,
-            "mod0",
-        } );
-        dcus.emplace_back( DCUStats{
-            1,
-            0,
-            0,
-            0,
-            "mod1",
-        } );
-        dcus.emplace_back( DCUStats{
-            2,
-            0,
-            0,
-            0,
-            "mod2",
-        } );
+        dcus.emplace_back( make_stats( 0, 0, 0, 0, "mod0" ) );
+        dcus.emplace_back( make_stats( 1, 0, 0, 0, "mod1" ) );
+        dcus.emplace_back( make_stats( 2, 0, 0, 0, "mod2" ) );
         return dcus;
     }
 
@@ -237,4 +235,4 @@ TEST_CASE( "CRCs are cleared at the second boundary" )
 
     dc_stats.stop( );
     th.join( );
-}
\ No newline at end of file
+}