diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs
index 11764e15..fb55c8b5 100644
--- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs	
+++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs	
@@ -160,7 +160,7 @@ namespace VEPROMS
 								}
 								catch (Exception ex)
 								{
-									dved.PdfX = 0;
+									dved.PdfX = 10;
 								}
 							}
 						}
@@ -173,7 +173,7 @@ namespace VEPROMS
 							}
 							catch (Exception ex)
 							{
-								ipdfx = 0;
+								ipdfx = (emc.PdfToken==null||emc.PdfToken=="")?0:10;
 							}
 							int itype = 0;
 							try
@@ -562,7 +562,22 @@ namespace VEPROMS
 				if (cbxEnhVersions.Items.Count>0) cbxEnhVersions.SelectedIndex = 0;
 				if (lbEnhanced.Items.Count > 0) lbEnhanced.SelectedIndex = 0;
 				bsMiniEnhanced.DataSource = bsEnhanced.Current as EnhancedMiniConfig;
-				btnNewEnh.Visible = true;
+				
+				// only allow new if there are available non-linked 'enhanced format' docversions.
+				int cntAvailForLinkEnh = 0;
+				DocVersionInfoList nonenhdvs = DocVersionInfoList.GetNonEnhancedDocVersions();
+				foreach (DocVersionInfo nonenhdv in nonenhdvs)
+				{
+					if (nonenhdv.VersionID != _DocVersionConfig.MyDocVersion.VersionID)
+					{
+						if (((nonenhdv.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) ||
+						((nonenhdv.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedDeviations) == E_PurchaseOptions.EnhancedDeviations))
+						{
+							cntAvailForLinkEnh++;
+						}
+					}
+				}
+				btnNewEnh.Visible = (cntAvailForLinkEnh > 0);	
 			}
 		}
 
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
index 11bdf727..50d0f7bc 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
@@ -578,7 +578,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public ConfigDynamicTypeDescriptor MyConfig
 		{
-			get { return Get().DocVersionConfig; }
+			get { return DocVersionConfig; }
 		}
 		//public bool HasStandardSteps()
 		//{ return false; }
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs
index 8d13499f..e6d0ab52 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs
@@ -247,7 +247,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public ConfigDynamicTypeDescriptor MyConfig
 		{
-			get { return Get().FolderConfig; }
+			get { return FolderConfig; }
 		}
 		/// <summary>
 		/// These settings are set on the user interface side.
diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index f8277ea9..efed110e 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -916,6 +916,8 @@ namespace Volian.Controls.Library
 
 		private void tvROFST_DoubleClick(object sender, EventArgs e)
 		{
+			// B2016-132: don't process a double click on an RO if on an enhanced step:
+			if (MyRTB != null && MyRTB.MyItemInfo != null && MyRTB.MyItemInfo.IsEnhancedStep) return;	
 			//if (tvROFST.SelectedNode == null) return;
 			//RunRoEditor();
 			SaveRO();