diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index c5a602054c..4b9eabd3ba 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -157,11 +157,13 @@ void SCH_EDIT_FRAME::EditComponent( SCH_COMPONENT* aComponent )
     // quasimodal mode for the quasimodal frame support to work.  So don't use
     // the QUASIMODAL macros here.
     int ret = dlg->ShowQuasiModal();
-    (void) ret;     // not used. Make coverity and static analysers quiet.
 
     m_canvas->SetIgnoreMouseEvents( false );
     m_canvas->MoveCursorToCrossHair();
     dlg->Destroy();
+
+    if( ret == wxID_OK )
+        GetCanvas()->Refresh();
 }
 
 
@@ -199,8 +201,6 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow
 
 void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemDeselected( wxListEvent& event )
 {
-    DBG( printf( "OnListItemDeselected()\n" ); )
-
     if( !m_skipCopyFromPanel )
     {
         if( !copyPanelToSelectedField() )
@@ -459,7 +459,6 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnOKButtonClick( wxCommandEvent& event
 
     m_parent->OnModify();
     m_parent->GetScreen()->TestDanglingEnds();
-    m_parent->GetCanvas()->Refresh( true );
 
     EndQuasiModal( wxID_OK );
 }
diff --git a/include/common.h b/include/common.h
index 5082cdfed5..b881444a01 100644
--- a/include/common.h
+++ b/include/common.h
@@ -281,12 +281,6 @@ int ProcessExecute( const wxString& aCommandLine, int aFlags = wxEXEC_ASYNC,
                     wxProcess *callback = NULL );
 
 
-/*******************/
-/* about_kicad.cpp */
-/*******************/
-void InitKiCadAbout( wxAboutDialogInfo& info );
-
-
 /**************/
 /* common.cpp */
 /**************/
diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp
index 78e68522e0..48bd89e1ec 100644
--- a/pcbnew/dialogs/dialog_set_grid.cpp
+++ b/pcbnew/dialogs/dialog_set_grid.cpp
@@ -239,7 +239,7 @@ void DIALOG_SET_GRID::OnOkClick( wxCommandEvent& event )
 
     if( !success )
     {
-        wxMessageBox( wxString::Format( _( "Incorrect grid origin (size must be >= %.3f and <= %.f mm)" ),
+        wxMessageBox( wxString::Format( _( "Incorrect grid origin (coordinates must be >= %.3f mm and <= %.3f mm)" ),
             -MAX_GRID_OFFSET/IU_PER_MM, MAX_GRID_OFFSET/IU_PER_MM ) );
         return;
     }