diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 252f1fdf..c2251966 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -2367,6 +2367,7 @@ namespace Volian.Controls.Library
 				MyStepPanel.ItemMoving--;
 				LastMethodsPop();
 			}
+			this.Enabled = this.MyItemInfo.IsApplicable(MyStepPanel.ApplDisplayMode);
 			_Loading = false;
 			//// TIMING: DisplayItem.TimeIt("CSLARTB Controls Add");
 		}
diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs
index cebec712..83b8cfbf 100644
--- a/PROMS/Volian.Print.Library/PromsPrinter.cs
+++ b/PROMS/Volian.Print.Library/PromsPrinter.cs
@@ -385,7 +385,7 @@ namespace Volian.Print.Library
 					LastFmtName = mySection.ActiveFormat.Name;
 					string hlsText = "";
 					int hlsItemId = 0;
-					if (mySection.IsStepSection && mySection.Steps.Count > 0)
+					if (mySection.IsStepSection && mySection.Steps != null && mySection.Steps.Count > 0)
 					{
 						hlsItemId = mySection.Steps[0].ItemID;
 						hlsText = mySection.Steps[0].DisplayText; // save the High level step text for use in the page list
@@ -778,10 +778,10 @@ namespace Volian.Print.Library
 			vlnParagraph myParagraph = new vlnParagraph(null, cb, myItemInfo, (float)myItemInfo.MyDocStyle.Layout.LeftMargin, _NoBreakYOffset, 0, myItemInfo.ColumnMode, myItemInfo.ActiveFormat, null, null);
 			float localYPageStart = 0;
 			float yPageStart = yTopMargin;
-			if (myItemInfo.HasChildren)
+			if (myItemInfo.HasChildren || myItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave > 0)
 				localYPageStart = myParagraph.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
 			else if(!myItemInfo.MyDocStyle.OptionalSectionContent)
-				PrintTextMessage(cb, "No Section Content", _TextLayer);
+			  PrintTextMessage(cb, "No Section Content", _TextLayer);
 			SectionConfig.SectionPagination sp = SectionConfig.SectionPagination.Separate;  // always the default
 			if ( section.NextItemCount > 0)
 			{