diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index 91e06c1dff..2075782f0a 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -164,8 +164,7 @@ void SCH_EDIT_FRAME::saveProjectSettings()
 
 void SCH_EDIT_FRAME::SaveProjectLocalSettings()
 {
-    if( m_schematic )
-        m_schematic->RecordERCExclusions();
+    RecordERCExclusions();
 }
 
 
diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index dac6ee9c97..b6f3d339a7 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -870,7 +870,7 @@ std::vector<FP_SHAPE*> PAD_TOOL::RecombinePad( PAD* aPad, bool aIsDryRun, BOARD_
     {
         aCommit.Modify( aPad );
 
-        if( aPad->GetShape() == PAD_SHAPE::CIRCLE || aPad->GetShape() == PAD_SHAPE::RECTANGLE )
+        if( aPad->GetShape() == PAD_SHAPE::CIRCLE || aPad->GetShape() == PAD_SHAPE::RECT )
         {
             // Use the existing pad as an anchor
             aPad->SetAnchorPadShape( aPad->GetShape() );