diff --git a/common/libeval/numeric_evaluator.cpp b/common/libeval/numeric_evaluator.cpp
index bcdb8f7a39..1bc44646c2 100644
--- a/common/libeval/numeric_evaluator.cpp
+++ b/common/libeval/numeric_evaluator.cpp
@@ -348,8 +348,8 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
             break;
     }
 
-    double siScaler;
-    Unit   convertFrom;
+    double siScaler = 1.0;
+    Unit   convertFrom = Unit::Invalid;
 
     if( ch == 0 )
     {
diff --git a/pcbnew/drc/drc_engine.h b/pcbnew/drc/drc_engine.h
index 31fca93f29..50d19cb338 100644
--- a/pcbnew/drc/drc_engine.h
+++ b/pcbnew/drc/drc_engine.h
@@ -83,7 +83,7 @@ class DRC_ENGINE : public UNITS_PROVIDER
 {
 public:
     DRC_ENGINE( BOARD* aBoard = nullptr, BOARD_DESIGN_SETTINGS* aSettings = nullptr );
-    ~DRC_ENGINE();
+    virtual ~DRC_ENGINE();
 
     void SetBoard( BOARD* aBoard ) { m_board = aBoard; }
     BOARD* GetBoard() const { return m_board; }