diff --git a/docs/source/release/v3.11.0/ui.rst b/docs/source/release/v3.11.0/ui.rst
index b44c27847801c7225d7fedbbea6417724d311f28..ae12c0891cdf02860d6e3d27e374421a96fa03b6 100644
--- a/docs/source/release/v3.11.0/ui.rst
+++ b/docs/source/release/v3.11.0/ui.rst
@@ -33,7 +33,6 @@ Custom Interfaces
 - Indirect ILL calibration tab, deprecated since v3.9 is now dropped.
 - SANS > ISIS SANS v2 experimental interface has become available. It has basic reduction functionalities and makes use of the new reduction backend.
 
-
 SliceViewer Improvements
 ########################
 
@@ -73,6 +72,7 @@ Bugs Resolved
 - Fixed a bug where setting a table column's plot type would not be saved to the workspace correctly.
 - We have improved the documentation for the `RewriteSpectraMap` property of the `LoadInstrument`
   algorithm
+- Fixed a bug where replacing a workspace with X errors with a workspace without the errors while Data View was open would result in a crash.
 
 Full list of
 `GUI <http://github.com/mantidproject/mantid/pulls?q=is%3Apr+milestone%3A%22Release+3.11%22+is%3Amerged+label%3A%22Component%3A+GUI%22>`_
diff --git a/docs/source/release/v3.12.0/ui.rst b/docs/source/release/v3.12.0/ui.rst
index 38d6848cedc4969771a238bb1195e71ed9e26269..047650eaffb968b23e1f41ccd81af81509afa9f3 100644
--- a/docs/source/release/v3.12.0/ui.rst
+++ b/docs/source/release/v3.12.0/ui.rst
@@ -15,9 +15,6 @@ Installation
 Workbench
 ---------
 
-- Fixed a bug where replacing a workspace with X errors with a workspace without the errors while Data View was open would result in a crash.
-
-
 SliceViewer and Vates Simple Interface
 --------------------------------------
 
diff --git a/instrument/IRIS_fmica_006_Parameters.xml b/instrument/IRIS_fmica_006_Parameters.xml
index 2cc3724dd7ebdac60f6b207838a0b67daa18d502..76f2ac22139d84e50c000740362b5abb42b0be7f 100644
--- a/instrument/IRIS_fmica_006_Parameters.xml
+++ b/instrument/IRIS_fmica_006_Parameters.xml
@@ -32,7 +32,7 @@
 </parameter>
 
 <parameter name="analyser" type="string">
-  <value val="fmica" />
+  <value val="mica" />
 </parameter>
 
 <parameter name="reflection" type="string">
diff --git a/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index 5e40dce20f710c52fcfb8147426b87cb2984e47d..41effdfc5ad5722d44457d37eefa2170c3dc38f5 100644
--- a/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -133,13 +133,13 @@ void EnggDiffractionViewQtGUI::doSetupTabCalib() {
   if (m_uiTabCalib.MWRunFiles_new_vanadium_num->getUserInput()
           .toString()
           .isEmpty()) {
-    m_uiTabCalib.MWRunFiles_new_vanadium_num->setUserInput(
+    m_uiTabCalib.MWRunFiles_new_vanadium_num->setFileTextWithoutSearch(
         QString::fromStdString(vanadiumRun));
   }
   if (m_uiTabCalib.MWRunFiles_new_ceria_num->getUserInput()
           .toString()
           .isEmpty()) {
-    m_uiTabCalib.MWRunFiles_new_ceria_num->setUserInput(
+    m_uiTabCalib.MWRunFiles_new_ceria_num->setFileTextWithoutSearch(
         QString::fromStdString(ceriaRun));
   }
 
diff --git a/qt/widgets/common/src/MWRunFiles.cpp b/qt/widgets/common/src/MWRunFiles.cpp
index 324ba1c02348428e2a7df205954ede577410db6c..4dc9bbc468ea5f4c5fac62f6e166f1a1a5d628be 100644
--- a/qt/widgets/common/src/MWRunFiles.cpp
+++ b/qt/widgets/common/src/MWRunFiles.cpp
@@ -260,9 +260,9 @@ MWRunFiles::MWRunFiles(QWidget *parent)
 
 MWRunFiles::~MWRunFiles() {
   // Before destruction, make sure the file finding thread has stopped running.
-  // Wait if necessary.
+  // Wait if necessary. This can freeze up Mantid.
   m_thread->exit(-1);
-  m_thread->wait();
+  m_thread->wait(50);
 }
 
 /**
@@ -809,7 +809,6 @@ void MWRunFiles::inspectThreadResult() {
 void MWRunFiles::readSettings(const QString &group) {
   QSettings settings;
   settings.beginGroup(group);
-
   m_lastDir = settings.value("last_directory", "").toString();
 
   if (m_lastDir == "") {