diff --git a/core/include/Data/SqpIterator.h b/core/include/Data/SqpIterator.h
index aae9315..962bbe3 100644
--- a/core/include/Data/SqpIterator.h
+++ b/core/include/Data/SqpIterator.h
@@ -22,7 +22,11 @@ public:
 
     virtual ~SqpIterator() noexcept = default;
     SqpIterator(const SqpIterator &) = default;
-    SqpIterator &operator=(SqpIterator other) { swap(m_CurrentValue, other.m_CurrentValue); }
+    SqpIterator &operator=(SqpIterator other)
+    {
+        swap(m_CurrentValue, other.m_CurrentValue);
+        return *this;
+    }
 
     SqpIterator &operator++()
     {
diff --git a/core/src/Data/DataSeriesIterator.cpp b/core/src/Data/DataSeriesIterator.cpp
index a02ca2d..5066fe7 100644
--- a/core/src/Data/DataSeriesIterator.cpp
+++ b/core/src/Data/DataSeriesIterator.cpp
@@ -19,7 +19,6 @@ DataSeriesIteratorValue &DataSeriesIteratorValue::operator=(DataSeriesIteratorVa
 
 int DataSeriesIteratorValue::distance(const DataSeriesIteratorValue &other) const
 {
-    auto dist = m_Impl->distance(*other.m_Impl);
     return m_Impl->distance(*other.m_Impl);
 }
 
diff --git a/gui/src/Variable/VariableInspectorWidget.cpp b/gui/src/Variable/VariableInspectorWidget.cpp
index 45907ae..365b843 100644
--- a/gui/src/Variable/VariableInspectorWidget.cpp
+++ b/gui/src/Variable/VariableInspectorWidget.cpp
@@ -94,18 +94,22 @@ public:
                         auto variableModel = sqpApp->variableController().variableModel();
                         variableModel->abortProgress(index);
                     }
+                    return true;
                 }
                 else {
-                    QStyledItemDelegate::editorEvent(event, model, option, index);
+                    return QStyledItemDelegate::editorEvent(event, model, option, index);
                 }
             }
             else {
-                QStyledItemDelegate::editorEvent(event, model, option, index);
+                return QStyledItemDelegate::editorEvent(event, model, option, index);
             }
         }
         else {
-            QStyledItemDelegate::editorEvent(event, model, option, index);
+            return QStyledItemDelegate::editorEvent(event, model, option, index);
         }
+
+
+        return QStyledItemDelegate::editorEvent(event, model, option, index);
     }
 };