diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index 579f84102c..fa27f9e102 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
  * Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
- * Copyright (C) 2012-2021 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2012-2023 Kicad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2013-2017 CERN
  * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
@@ -337,6 +337,7 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
     ufm_screenPixelSize = 1;
     ufm_pixelSizeMultiplier = 1;
     ufm_antialiasingOffset = 1;
+    m_swapInterval  = 0;
 }
 
 
diff --git a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
index 5b97b29aa4..d96be684ac 100644
--- a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
+++ b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
@@ -2708,13 +2708,13 @@ void SCH_ALTIUM_PLUGIN::ParseWire( const std::map<wxString, wxString>& aProperti
 
 void SCH_ALTIUM_PLUGIN::ParseJunction( const std::map<wxString, wxString>& aProperties )
 {
+    SCH_SCREEN* screen = getCurrentScreen();
+    wxCHECK( screen, /* void */ );
+
     ASCH_JUNCTION elem( aProperties );
 
     SCH_JUNCTION* junction = new SCH_JUNCTION( elem.location + m_sheetOffset );
 
-    SCH_SCREEN* screen = getCurrentScreen();
-    wxCHECK( screen, /* void */ );
-
     junction->SetFlags( IS_NEW );
     screen->Append( junction );
 }
diff --git a/eeschema/tools/symbol_editor_edit_tool.cpp b/eeschema/tools/symbol_editor_edit_tool.cpp
index 7856a55355..114a775d32 100644
--- a/eeschema/tools/symbol_editor_edit_tool.cpp
+++ b/eeschema/tools/symbol_editor_edit_tool.cpp
@@ -269,10 +269,10 @@ int SYMBOL_EDITOR_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
     {
         if( item->Type() == LIB_PIN_T )
         {
-            LIB_PIN*  pin = static_cast<LIB_PIN*>( item );
-            VECTOR2I pos = pin->GetPosition();
+            LIB_PIN*  curr_pin = static_cast<LIB_PIN*>( item );
+            VECTOR2I pos = curr_pin->GetPosition();
 
-            toDelete.insert( pin );
+            toDelete.insert( curr_pin );
 
             // when pin editing is synchronized, pins in the same position, with the same name
             // in different units are also removed.  But only one pin per unit (matching)
@@ -280,11 +280,11 @@ int SYMBOL_EDITOR_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
             {
                 std::vector<bool> got_unit( symbol->GetUnitCount() + 1 );
 
-                got_unit[pin->GetUnit()] = true;
+                got_unit[curr_pin->GetUnit()] = true;
 
-                int curr_convert = pin->GetConvert();
-                ELECTRICAL_PINTYPE etype = pin->GetType();
-                wxString name = pin->GetName();
+                int curr_convert = curr_pin->GetConvert();
+                ELECTRICAL_PINTYPE etype = curr_pin->GetType();
+                wxString name = curr_pin->GetName();
                 std::vector<LIB_PIN*> pins = symbol->GetAllLibPins();
 
                 for( LIB_PIN* pin : pins )