diff --git a/src/common/Export.cpp b/src/common/Export.cpp
index c3aec4cf1d2131c113b7ce4686bfd7b96082e48c..80b2f44105bd11a1994371ddaa7f6f9933d7cc4f 100644
--- a/src/common/Export.cpp
+++ b/src/common/Export.cpp
@@ -209,7 +209,7 @@ void Export::open_export_window(QWidget *parent, RenderLayout *render_layout) {
 
 void Export::open_export_variable_window(const std::map<std::string, Variable *> &variable_list, const std::string &export_filename) {
     Ui_counter_choice_box export_variable_window;
-    QDialog dialog_box;
+    QDialog dialog_box(nullptr);
     export_variable_window.setupUi(&dialog_box);
 
     for (std::map<std::string, Variable *>::const_iterator it = variable_list.begin();
diff --git a/src/render/Render_abstract.cpp b/src/render/Render_abstract.cpp
index 0200efb8e05bc2821d7b6287e49d88e631b43bee..968dbf5e951b4004177543e9e20a384fbb399a3b 100644
--- a/src/render/Render_abstract.cpp
+++ b/src/render/Render_abstract.cpp
@@ -348,7 +348,7 @@ void Render_abstract::update_vertical_line(const Element_pos &line_position) {
     const std::map<long int, double>::const_iterator it_end = var_map.end();
     while (it != it_end) {
         draw_text_value((*it).first, (*it).second, -1);
-        it++;
+        ++it;
     }
 
     update_render();
diff --git a/tests/generator/Generator.cpp b/tests/generator/Generator.cpp
index 39587927c9edabedda90f6e326ecc4e487d2554f..f517437c4fbb5112c1fcf4a8347fdcf113f482c9 100644
--- a/tests/generator/Generator.cpp
+++ b/tests/generator/Generator.cpp
@@ -14,31 +14,32 @@
 #include <iostream>
 #include <math.h>
 
-Generator::Generator (QString name,
-                      int depth, int procNbr, int nbrOfState, int nbrOfLine,
-                      int countNbr, int eventNbr, int linkNbr,
-                      int eventTypeNbr, int linkTypeNbr,
-                      bool paje, bool otf, bool tau)
-{
+Generator::Generator(QString name,
+                     int depth, int procNbr, int nbrOfState, int nbrOfLine,
+                     int countNbr, int eventNbr, int linkNbr,
+                     int eventTypeNbr, int linkTypeNbr,
+                     bool paje, bool otf, bool tau) :
+    _name(name),
+    _depth(depth),
+    _procNbr(procNbr),
+    _numberOfState(nbrOfState),
+    _numberOfLine(nbrOfLine),
+
+    _counter(false),
+    _event(false),
+    _link(false),
+
+    _linkNbr(linkNbr),
+    _linkTypeNbr(linkTypeNbr),
+    _eventNbr(eventNbr),
+    _eventTypeNbr(eventTypeNbr),
+    _counterNbr(countNbr) {
+    _dest = nullptr;
+
     _paje          = paje;
     _otf           = otf;
     _tau           = tau;
 
-    _name          = name;
-    _depth         = depth;
-    _procNbr       = procNbr;
-    _numberOfState = nbrOfState;
-    _numberOfLine  = nbrOfLine;
-
-    _counter       = false;
-    _event         = false;
-    _link          = false;
-
-    _linkNbr       = linkNbr;
-    _linkTypeNbr   = linkTypeNbr;
-    _eventNbr      = eventNbr;
-    _eventTypeNbr  = eventTypeNbr;
-    _counterNbr    = countNbr;
     _size          = 0;
 
 
@@ -71,8 +72,7 @@ Generator::Generator (QString name,
     if (otf)
         _otfGen  = new OTFGenerator  ();
     if (tau)
-        _tauGen  = new TauGenerator  ();
-
+        _tauGen = new TauGenerator();
 }
 
 Generator::~Generator (){
diff --git a/tests/generator/Generator.hpp b/tests/generator/Generator.hpp
index 23ded03ba2820d019ecba8b2cf99d1a19fd519aa..e25280ead36774011d634c91c8aaa07b2b7965a1 100644
--- a/tests/generator/Generator.hpp
+++ b/tests/generator/Generator.hpp
@@ -82,6 +82,8 @@ public :
                bool paje, bool otf, bool tau);
     // Destructor
     virtual ~Generator     ();
+
+    Generator &operator=(const Generator &) = default;
     // Main function that launch the creation of the traces
     void generate  ();
 
diff --git a/tests/generator/OTFGenerator.cpp b/tests/generator/OTFGenerator.cpp
index 708fac12e383e6781c3daaf560ca05420f46ec0e..dc590a07caafab8ca3fd64a788a08b5e14e21647 100644
--- a/tests/generator/OTFGenerator.cpp
+++ b/tests/generator/OTFGenerator.cpp
@@ -13,6 +13,7 @@
 #include "OTFGenerator.hpp"
 
 OTFGenerator::OTFGenerator   (){
+    _dest = nullptr;
 }
 
 OTFGenerator::~OTFGenerator  (){
diff --git a/tests/generator/TauGenerator.cpp b/tests/generator/TauGenerator.cpp
index e6438413e5af95285e091566a566fa227790ef12..f513cc88050cb2742cd154e173137198f55fb770 100644
--- a/tests/generator/TauGenerator.cpp
+++ b/tests/generator/TauGenerator.cpp
@@ -14,6 +14,7 @@
 
 
 TauGenerator::TauGenerator   (){
+    _dest = nullptr;
 }
 
 TauGenerator::~TauGenerator  (){