diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index d1063f8e7..baffd4115 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -76,7 +76,7 @@ void ProjectFileIO::UpdatePrefs()
 void ProjectFileIO::SetProjectTitle( int number)
 {
    auto &project = mProject;
-   auto &window = GetProjectFrame( project );
+   auto &window = ProjectWindow::Get( project );
    wxString name = project.GetProjectName();
 
    // If we are showing project numbers, then we also explicitly show "<untitled>" if there
diff --git a/src/export/Export.cpp b/src/export/Export.cpp
index cbcb2507f..33f9a3309 100644
--- a/src/export/Export.cpp
+++ b/src/export/Export.cpp
@@ -780,7 +780,7 @@ void Exporter::DisplayOptions(int index)
    }
 
 #if defined(__WXMSW__)
-   mPlugins[mf]->DisplayOptions(mProject, msf);
+   mPlugins[mf]->DisplayOptions( FindProjectFrame( mProject ), msf);
 #else
    mPlugins[mf]->DisplayOptions(mDialog, msf);
 #endif