diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs
index 1c6b518c..6da3ab4e 100644
--- a/PROMS/VEPROMS User Interface/dlgExportImport.cs	
+++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs	
@@ -163,7 +163,7 @@ namespace VEPROMS
 			}
 			if (MyFolder != null)
 			{
-				sfd.FileName = string.Format("{0}-{1}.expx", Database.ActiveDatabase, MyFolder.Name);
+				sfd.FileName = string.Format("{0}-{1}.expx", Database.ActiveDatabase, MyFolder.Name.Replace("/", "_").Replace("\\", "_"));
 				if (sfd.ShowDialog(this) == DialogResult.OK && sfd.FileName != string.Empty)
 				{
 					txtExport.Text = sfd.FileName;
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 2b371fe2..744327a8 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -3110,7 +3110,8 @@ namespace VEPROMS
 					_MyLog.WarnFormat("===============Override Close====================");
 				}
 
-				tc.CloseTabItem(dti);
+                System.Threading.Thread.Sleep(500); //wait 1/2 a second to see if it closes on it's own
+                tc.CloseTabItem(dti);
 			}
 
 			_TimeActivity1.Close();
diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs
index b2c26fd5..f4636025 100644
--- a/PROMS/Volian.Controls.Library/StepRTB.cs
+++ b/PROMS/Volian.Controls.Library/StepRTB.cs
@@ -3046,7 +3046,23 @@ namespace Volian.Controls.Library
 
 			// C2015-028 Add Editorial Mode to PROMS Step Editor
 			//   if in Editorial Mode, treat it the same as if the EditorialSpellCheck flag is set in the Format file
-			bool editorialmode = (this.Parent.Parent.Parent as StepTabPanel).MyDisplayTabControl.IsInEditorialMode;
+			bool editorialmode;
+			try
+			{
+                StepTabPanel pnl = null;
+                Control tempcntrl = Parent;
+                while (tempcntrl != null && pnl == null)
+                {
+                    tempcntrl = tempcntrl.Parent;
+                    pnl = tempcntrl as StepTabPanel;
+                }
+
+                editorialmode = pnl.MyDisplayTabControl.IsInEditorialMode;
+            }
+			catch 
+			{
+				editorialmode = false;
+            }
 
             if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || editorialmode)
 					DidEditorialSpellCheck = MySpellCheckDlg.DidCorrectSpelling;  // B2015-024 spell checker in editoral mode