diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
index 0f0b210e50acefc5b01cabe4027aac77c0136b3c..46c992a80c7216d8824a6cbf758a42336df9f46b 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
@@ -304,8 +304,11 @@ void DiagramList::truncateToRange(QDateTime const& start, QDateTime const& end)
     update();
 }
 
-void DiagramList::setList(std::vector< std::pair<QDateTime, float> > coords)
+void DiagramList::setList(std::vector<std::pair<QDateTime, float>> const& coords)
 {
+    if (coords.empty())
+        return;
+
     this->_startDate = coords[0].first;
     _coords.emplace_back(0.0f, coords[0].second);
 
@@ -320,8 +323,11 @@ void DiagramList::setList(std::vector< std::pair<QDateTime, float> > coords)
     update();
 }
 
-void DiagramList::setList(std::vector< std::pair<float, float> > coords)
+void DiagramList::setList(std::vector< std::pair<float, float> > const& coords)
 {
+    if (coords.empty())
+        return;
+
     this->_startDate = QDateTime();
     std::size_t nCoords = coords.size();
     for (std::size_t i = 0; i < nCoords; i++)
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.h b/Applications/DataExplorer/DataView/DiagramView/DiagramList.h
index 734edd39d7319fe87fa963f84725de4a97bc6a61..60114cadae3c061d43bce53586cc5705c4ca9968 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.h
@@ -124,7 +124,7 @@ public:
      * Sets the list of x/y-coordinates.
      * \param coords List of coordinates.
      */
-    void setList(std::vector< std::pair<float, float> > coords);
+    void setList(std::vector< std::pair<float, float> > const& coords);
 
     /**
      * Sets the list of x/y-coordinates.
@@ -132,7 +132,7 @@ public:
      * days from the first date (which is set as day 0)
      * \param coords List of coordinates.
      */
-    void setList(std::vector< std::pair<QDateTime, float> > coords);
+    void setList(std::vector< std::pair<QDateTime, float> > const& coords);
 
     /// Specifies the unit of the x Axis.
     void setXUnit(QString unit) { _xUnit = unit; }
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
index f55381614a3cfff57f906c7c6e74cc28d0cef4c9..48abe51c040a5d8e9680251b4cc11ac3cd53ed5d 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
@@ -77,7 +77,8 @@ void DiagramPrefsDialog::accept()
         return;
     }
 
-    // data has been loaded
+    // Data has been loaded.
+    // If loading the other lists fails at least nothing terrible will happen.
     if (_list[0]->size() > 0)
     {
         bool window_is_empty(false);
diff --git a/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp b/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
index 6ddb4f81652d14f687e950536963b27f014dea64..e54f20f7a0d3347daba65c8ab47aff5a6dac0034 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
@@ -117,7 +117,7 @@ void QArrow::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QW
 }
 
 /// Changes orientation of the arrow.
-void QArrow::setAngle(float a)
+void QArrow::setAngle(qreal a)
 {
     _arrowAngle = a;
 }
diff --git a/Applications/DataExplorer/DataView/DiagramView/QArrow.h b/Applications/DataExplorer/DataView/DiagramView/QArrow.h
index 85e11e17f4bbd999cc9f23988b13bced73add964..208fd333cd50ffe69baf3b217cea53577cb9e345 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QArrow.h
+++ b/Applications/DataExplorer/DataView/DiagramView/QArrow.h
@@ -35,7 +35,7 @@ public:
     void paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
                QWidget* widget) override;
     QRectF boundingRect() const override;
-    void setAngle(float a);
+    void setAngle(qreal a);
     void setLength(qreal l);
 
 private: