diff --git a/common/pg_properties.cpp b/common/pg_properties.cpp
index c851a1d25d..199264668b 100644
--- a/common/pg_properties.cpp
+++ b/common/pg_properties.cpp
@@ -169,7 +169,7 @@ bool PGPROPERTY_DISTANCE::StringToDistance( wxVariant& aVariant, const wxString&
 
 
     // Conversion to internal units
-    long newValueIU;
+    long newValueIU = 0;
 
     switch( unit )
     {
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index b1186522a8..27269e015c 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -618,7 +618,7 @@ findItemsFromSyncSelection( const SCHEMATIC& aSchematic, const std::string aSync
     }
 
     // Init sync maps from the sync string
-    for( int i = 0; i < syncArray.size(); i++ )
+    for( size_t i = 0; i < syncArray.size(); i++ )
     {
         wxString syncEntry = syncArray[i];
 
diff --git a/eeschema/dialogs/panel_setup_buses.cpp b/eeschema/dialogs/panel_setup_buses.cpp
index 616450e237..52b778eb49 100644
--- a/eeschema/dialogs/panel_setup_buses.cpp
+++ b/eeschema/dialogs/panel_setup_buses.cpp
@@ -28,6 +28,7 @@
 PANEL_SETUP_BUSES::PANEL_SETUP_BUSES( wxWindow* aWindow, SCH_EDIT_FRAME* aFrame ) :
         PANEL_SETUP_BUSES_BASE( aWindow ),
         m_frame( aFrame ),
+        m_lastAlias( 0 ),
         m_errorGrid( nullptr ),
         m_errorRow( -1 )
 {
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index 63e20ba6b2..55b4e7e9ee 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -139,10 +139,14 @@ void SCH_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
     SCH_BASE_FRAME::LoadSettings( eeconfig() );
 
     SCH_SEARCH_DATA* searchData = dynamic_cast<SCH_SEARCH_DATA*>( m_findReplaceData.get() );
-    searchData->replaceReferences = eeconfig()->m_FindReplaceExtra.replace_references;
-    searchData->searchAllFields = eeconfig()->m_FindReplaceExtra.search_all_fields;
-    searchData->searchAllPins = eeconfig()->m_FindReplaceExtra.search_all_pins;
-    searchData->searchCurrentSheetOnly = eeconfig()->m_FindReplaceExtra.search_current_sheet_only;
+
+    if( searchData )
+    {
+        searchData->replaceReferences = eeconfig()->m_FindReplaceExtra.replace_references;
+        searchData->searchAllFields = eeconfig()->m_FindReplaceExtra.search_all_fields;
+        searchData->searchAllPins = eeconfig()->m_FindReplaceExtra.search_all_pins;
+        searchData->searchCurrentSheetOnly = eeconfig()->m_FindReplaceExtra.search_current_sheet_only;
+    }
 
     GetRenderSettings()->m_ShowPinsElectricalType = false;
 }
@@ -164,11 +168,15 @@ void SCH_EDIT_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
         // hierarchy panel
 
         SCH_SEARCH_DATA* searchData = dynamic_cast<SCH_SEARCH_DATA*>( m_findReplaceData.get() );
-        eeconfig()->m_FindReplaceExtra.replace_references = searchData->replaceReferences;
-        eeconfig()->m_FindReplaceExtra.search_all_fields = searchData->searchAllFields;
-        eeconfig()->m_FindReplaceExtra.search_all_pins = searchData->searchAllPins;
-        eeconfig()->m_FindReplaceExtra.search_current_sheet_only =
-                searchData->searchCurrentSheetOnly;
+
+        if( searchData )
+        {
+            eeconfig()->m_FindReplaceExtra.replace_references = searchData->replaceReferences;
+            eeconfig()->m_FindReplaceExtra.search_all_fields = searchData->searchAllFields;
+            eeconfig()->m_FindReplaceExtra.search_all_pins = searchData->searchAllPins;
+            eeconfig()->m_FindReplaceExtra.search_current_sheet_only =
+                    searchData->searchCurrentSheetOnly;
+        }
     }
 }
 
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index dd203e6e52..817e716187 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -401,7 +401,8 @@ PCB_PAINTER::PCB_PAINTER( GAL* aGal, FRAME_T aFrameType ) :
     PAINTER( aGal ),
     m_frameType( aFrameType ),
     m_maxError( ARC_HIGH_DEF ),
-    m_holePlatingThickness( 0 )
+    m_holePlatingThickness( 0 ),
+    m_lockedShadowMargin( 0 )
 {
 }