diff --git a/src/Menus.cpp b/src/Menus.cpp
index 8b51810e6..d672ac1e3 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -8231,7 +8231,7 @@ class ASAProgress final : public SAProgress {
          work = (is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] +
                 (is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * f;
       }
-      int updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
+      auto updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
       return (updateResult == ProgressResult::Success);
    }
    bool set_matrix_progress(int cells) override {
@@ -8240,7 +8240,7 @@ class ASAProgress final : public SAProgress {
              (is_audio[0] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[0] +
              (is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[1];
       work += mCellCount * MATRIX_WORK_UNIT;
-      int updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
+      auto updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
       return (updateResult == ProgressResult::Success);
    }
    bool set_smoothing_progress(int i) override {
@@ -8250,7 +8250,7 @@ class ASAProgress final : public SAProgress {
              (is_audio[1] ? AUDIO_WORK_UNIT : MIDI_WORK_UNIT) * mFrames[1] +
              MATRIX_WORK_UNIT * mFrames[0] * mFrames[1];
       work += i * wxMax(mFrames[0], mFrames[1]) * SMOOTHING_WORK_UNIT;
-      int updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
+      auto updateResult = mProgress->Update((int)(work), (int)(mTotalWork));
       return (updateResult == ProgressResult::Success);
    }
 };
@@ -8332,6 +8332,7 @@ void AudacityProject::OnScoreAlign()
    {
       Mixer mix(
          waveTracks,              // const WaveTrackConstArray &inputTracks
+         false, // mayThrow -- is this right?
          Mixer::WarpOptions{ mTracks->GetTimeTrack() }, // const WarpOptions &warpOptions
          0.0,                     // double startTime
          endTime,                 // double stopTime
diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h
index 401a3bfea..c069d9be8 100644
--- a/src/effects/ScoreAlignDialog.h
+++ b/src/effects/ScoreAlignDialog.h
@@ -12,8 +12,44 @@
 #include <wx/dialog.h>
 #include <wx/slider.h>
 #include <wx/checkbox.h>
+
+#if 1
+
 #include "ScoreAlignParams.h"
 
+#else
+
+// Stub definitions
+struct ScoreAlignParams
+{
+   int mStatus;
+   double mMidiStart, mMidiEnd;
+   double mAudioStart, mAudioEnd;
+   float mFramePeriod;
+   float mWindowSize;
+   float mSilenceThreshold;
+   float mForceFinalAlignment;
+   float mIgnoreSilence;
+   float mPresmoothTime;
+   float mLineTime;
+   float mSmoothTime;
+};
+class SAProgress;
+class Alg_seq;
+
+extern int scorealign(
+   void *data,
+   long (*process)(void *data, float **buffer, long n),
+   unsigned channels,
+   double rate,
+   double endTime,
+   Alg_seq *seq,
+   SAProgress *progress,
+   ScoreAlignParams params
+);
+
+#endif
+
 class wxButton;
 class wxSizer;
 class wxString;