diff --git a/common/makefile.gtk b/common/makefile.gtk
index f5ccc0abbb..b9821c109f 100644
--- a/common/makefile.gtk
+++ b/common/makefile.gtk
@@ -21,9 +21,9 @@ common.a: $(COMMON_OBJECTS) makefile.gtk makefile.include
 	ar -rv $@ $(COMMON_OBJECTS)
 	ranlib $@
 
-pcbcommon.a: $(COMMON_PCB_OBJECTS) makefile.gtk makefile.include
+pcbcommon.a: $(PCB_COMMON_OBJECTS) makefile.gtk makefile.include
 	rm -f $@
-	ar -rv $@ $(COMMON_PCB_OBJECTS)
+	ar -rv $@ $(PCB_COMMON_OBJECTS)
 	ranlib $@
 
 install:common.a pcb_common.a
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index eb5d5e7446..8b147b5aaf 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -80,7 +80,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
     FullFileName = FileName;
     if( ( FullFileName.IsEmpty() ) && !IsNew )
     {
-        wxFileDialog dlg( this, _( "Open Schematic" ), wxEmptyString,
+        wxFileDialog dlg( this, _( "Open Schematic" ), wxGetCwd(),
                           wxEmptyString, SchematicFileWildcard,
                           wxFD_OPEN | wxFD_FILE_MUST_EXIST );
 
diff --git a/eeschema/save_schemas.cpp b/eeschema/save_schemas.cpp
index cf98900e91..31807e932e 100644
--- a/eeschema/save_schemas.cpp
+++ b/eeschema/save_schemas.cpp
@@ -62,7 +62,7 @@ bool WinEDA_SchematicFrame::SaveEEFile( SCH_SCREEN* screen, int FileSave )
 
     case FILE_SAVE_NEW:
     {
-        wxFileDialog dlg( this, _( "Schematic Files" ), wxEmptyString,
+        wxFileDialog dlg( this, _( "Schematic Files" ), wxGetCwd(),
                           screen->m_FileName, SchematicFileWildcard,
                           wxFD_SAVE | wxFD_OVERWRITE_PROMPT );