diff --git a/CMakeLists.txt b/CMakeLists.txt
index de4551cfbc..58b4c93a4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,7 +392,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
         # API with respect to the C99 standard, so make sure we force it to use its own compliant
         # snprintf
         add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
-        
+
         # Allow linking for Boost for the UUID against bcrypt
         set( EXTRA_LIBS "bcrypt" )
 
@@ -682,7 +682,7 @@ endif()
 if( KICAD_USE_OCE )
     set( OCC_LIBRARIES TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES )
 
-    find_package( OCE 0.16 REQUIRED ${OCC_LIBRARIES} )
+    find_package( OCE 0.18 REQUIRED ${OCC_LIBRARIES} )
 
 elseif( KICAD_USE_OCC )
     find_package(OpenCASCADE)
@@ -691,10 +691,10 @@ elseif( KICAD_USE_OCC )
                              " KICAD_USE_OCC=True but OpenCASCADE was not found!\n"
                              "================================================================\n")
     endif()
-    if( OCC_VERSION_STRING VERSION_LESS 6.8.0 )
+    if( OCC_VERSION_STRING VERSION_LESS 6.9.0 )
         MESSAGE( FATAL_ERROR "================================================================\n"
                              "OpenCASCADE version ${OCC_VERSION_STRING} was found.\n"
-                             "  KiCad requires a minimum version of 6.8.0\n"
+                             "  KiCad requires a minimum version of 6.9.0\n"
                              "================================================================\n")
     endif()
     include_directories( SYSTEM ${OCC_INCLUDE_DIR} )
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 678eb9e040..dfb5bce30a 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -614,6 +614,11 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
     if( !plotPanel || plotPanel->GetType() != simType )
         plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( NewPlotPanel( simType ) );
 
+    wxASSERT( plotPanel );
+
+    if( !plotPanel )    // Something is wrong
+        return;
+
     TRACE_DESC descriptor( *m_exporter, aName, aType, aParam );
 
     bool updated = false;
diff --git a/libs/kimath/src/geometry/shape_line_chain.cpp b/libs/kimath/src/geometry/shape_line_chain.cpp
index c59bac2e88..e507391bb4 100644
--- a/libs/kimath/src/geometry/shape_line_chain.cpp
+++ b/libs/kimath/src/geometry/shape_line_chain.cpp
@@ -1013,8 +1013,9 @@ double SHAPE_LINE_CHAIN::Area() const
 }
 
 
-SHAPE_LINE_CHAIN::POINT_INSIDE_TRACKER::POINT_INSIDE_TRACKER( const VECTOR2I& aPoint ) : 
+SHAPE_LINE_CHAIN::POINT_INSIDE_TRACKER::POINT_INSIDE_TRACKER( const VECTOR2I& aPoint ) :
     m_point( aPoint ),
+    m_finished( false ),
     m_state( 0 ),
     m_count( 0 )
 {
@@ -1095,7 +1096,7 @@ void SHAPE_LINE_CHAIN::POINT_INSIDE_TRACKER::AddPolyline( const SHAPE_LINE_CHAIN
     for (int i = 1; i < aPolyline.PointCount(); i++ )
     {
         auto p = aPolyline.CPoint( i );
-        if( !processVertex( m_lastPoint, p )) 
+        if( !processVertex( m_lastPoint, p ))
             return;
 
         m_lastPoint = p;
diff --git a/utils/kicad2step/kicad2step.cpp b/utils/kicad2step/kicad2step.cpp
index 0e9da4a33a..98988329c1 100644
--- a/utils/kicad2step/kicad2step.cpp
+++ b/utils/kicad2step/kicad2step.cpp
@@ -41,6 +41,8 @@ class KICAD2STEP_FRAME;
 class KICAD2MCAD_APP : public wxApp
 {
 public:
+    KICAD2MCAD_APP() : wxApp(), m_frame( nullptr ), m_Panel( nullptr )
+    {}
     virtual bool OnInit() override;
     virtual int OnRun() override;
     virtual void OnInitCmdLine(wxCmdLineParser& parser) override;