diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index f64b5692..3ed48c74 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -301,7 +301,7 @@ namespace Volian.Print.Library
 							box = null;
 							yoff += 1 * vlnPrintObject.SixLinesPerInch;
 						}
-						vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight,true, pp);
+						vlnParagraph para = new vlnParagraph(Parent, cb, childItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, pp);
 
 						// if doing the component list (FNP), keep track of the bottom most columns' data
 						// so this can be returned after the row is done.
@@ -3490,7 +3490,8 @@ namespace Volian.Print.Library
 					// In Checklist: I don't have children or if I have children the first child doesn't alignwithparent.
 					|| (!itemInfo.IsStepSection && itemInfo.MyHLS != null && itemInfo.MyHLS.FormatStepData.UseSmartTemplate
 						&& ((itemInfo.Steps == null || itemInfo.Steps.Count == 0)
-						|| !itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab)))
+						|| !itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab))
+					||((MyItemInfo.IsNote || MyItemInfo.IsCaution) && MyItemInfo.MyParent.IsSection))  // B2016-222 check if is a caution or note and parent is a section
 				{
 					bool doprint = !(MyPageHelper.DidHLSText && MyItemInfo.ItemID == MyPageHelper.HasHLSTextId);
 					if (MyItemInfo.IsSection)
diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs
index d8329885..a79aef9d 100644
--- a/PROMS/Volian.Print.Library/vlnTab.cs
+++ b/PROMS/Volian.Print.Library/vlnTab.cs
@@ -29,7 +29,7 @@ namespace Volian.Print.Library
 						{
 							if ("0123456789".Contains(Text[(int)_TabAlign].ToString()))
 							{
-								while ("0123456789".Contains(Text[(int)_TabAlign].ToString()))
+								while (_TabAlign < Text.Length && "0123456789".Contains(Text[(int)_TabAlign].ToString()))
 									_TabAlign++;
 								_TabAlign--;
 							}