diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
index e71bb1811ddea6e41c815e4e94da2777e42dca8e..fd3ee96f23bc94fcc8b596fb9a2f81e6013ee224 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
@@ -295,7 +295,8 @@ class CalibrationModel(object):
             kwargs["bank_names"] = ["North"]
 
         def generate_output_file(difc_list, tzero_list, bank_name, kwargs_to_pass):
-            file_path = calibration_dir + self._generate_output_file_name(vanadium_path, sample_path, instrument, bank=bank_name)
+            file_path = calibration_dir + self._generate_output_file_name(vanadium_path, sample_path, instrument,
+                                                                          bank=bank_name)
             write_ENGINX_GSAS_iparam_file(file_path, difc_list, tzero_list, **kwargs_to_pass)
 
         if not path.exists(calibration_dir):
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index 259773cb48525469aa614bb59ef134ff9a641de8..7e81c200e4bd9d60716ecd7abfa8cbe8700d26ca 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -75,13 +75,14 @@ class CalibrationPresenter(object):
         :param bank: Optional parameter to crop by bank.
         :param spectrum_numbers: Optional parameter to crop by spectrum number.
         """
-        self.worker = AsyncTask(self.model.create_new_calibration, (vanadium_path, sample_path), {
-            "plot_output": plot_output,
-            "instrument": self.instrument,
-            "rb_num": rb_num,
-            "bank": bank,
-            "spectrum_numbers": spectrum_numbers
-        },
+        self.worker = AsyncTask(self.model.create_new_calibration, (vanadium_path, sample_path),
+                                {
+                                "plot_output": plot_output,
+                                "instrument": self.instrument,
+                                "rb_num": rb_num,
+                                "bank": bank,
+                                "spectrum_numbers": spectrum_numbers
+                                },
                                 error_cb=self._on_error,
                                 success_cb=self._on_success)
         self.pending_calibration.set_calibration(vanadium_path, sample_path, self.instrument)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
index a34a7813060f4f347a4cd5af40d32f05be582273..7481cd493260c5ea6a2f62675b8b807781031c50 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
@@ -26,12 +26,12 @@ class CroppingPresenter(object):
 
     # Signal Activated Functions
 
-    def on_combo_changed(self, index_or_string_i_dunno):  # TODO: Does this signal send and index or text?
-        if index_or_string_i_dunno == 0:
+    def on_combo_changed(self, index):
+        if index == 0:
             self.bank = 1
             self.custom_spectra_enabled = False
             self.set_custom_visibility(False)
-        elif index_or_string_i_dunno == 1:
+        elif index == 1:
             self.bank = 2
             self.custom_spectra_enabled = False
             self.set_custom_visibility(False)
@@ -64,7 +64,7 @@ class CroppingPresenter(object):
 
     def set_custom_visibility(self, visible):
         if visible:
-            self.custom_valid = False
+            self.on_spectra_changed(self.view.get_custom_spectra_text())
             self.view.set_custom_spectra_entry_visible()
         else:
             self.custom_valid = True  # Make custom valid if not used, makes validation easier.
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
index f62e8b173751f770566f61118943043c25fce946..84cb6f592b28af9a18f8a40a2c871aae90907f88 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
@@ -36,6 +36,7 @@ class CroppingPresenterTest(unittest.TestCase):
         self.view.set_custom_spectra_entry_hidden.assert_called_with()
 
     def test_combo_changed_index_custom(self):
+        self.model.validate_and_clean_spectrum_numbers.return_value = ("", "1400")
         self.presenter.on_combo_changed(2)
 
         self.assertEqual(self.presenter.bank, 0)