diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs
index 39dfc960..9a3cea6e 100644
--- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs
+++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs
@@ -19,6 +19,7 @@ namespace UniversalEditor.Editors.RebelSoftware.InstallationScript
 		public InstallationScriptEditor()
 		{
 			InitializeComponent();
+			tvExplorer.PopulateSystemIcons();
 		}
 
 		private static UserInterface.EditorReference _er = null;
@@ -42,6 +43,7 @@ namespace UniversalEditor.Editors.RebelSoftware.InstallationScript
 			if (script == null) return;
 
 			TreeNode nodeDialogs = new TreeNode("Dialogs");
+			nodeDialogs.ImageKey = "generic-folder-closed";
 
 			foreach (ISDialog dialog in script.Dialogs)
 			{
@@ -50,6 +52,10 @@ namespace UniversalEditor.Editors.RebelSoftware.InstallationScript
 				{
 					tn.Text = "CopyFiles";
 				}
+				else if (dialog is DestinationDialog)
+				{
+					tn.Text = "Destination";
+				}
 				else if (dialog is FinishDialog)
 				{
 					tn.Text = "Finish";
diff --git a/CSharp/Plugins/UniversalEditor.Essential/DataFormats/PropertyList/ExtensibleConfiguration/ExtensibleConfigurationDataFormat.cs b/CSharp/Plugins/UniversalEditor.Essential/DataFormats/PropertyList/ExtensibleConfiguration/ExtensibleConfigurationDataFormat.cs
index 91fa6865..b4e3861c 100644
--- a/CSharp/Plugins/UniversalEditor.Essential/DataFormats/PropertyList/ExtensibleConfiguration/ExtensibleConfigurationDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Essential/DataFormats/PropertyList/ExtensibleConfiguration/ExtensibleConfigurationDataFormat.cs
@@ -101,7 +101,7 @@ namespace UniversalEditor.DataFormats.PropertyList.ExtensibleConfiguration
 						nextString = string.Empty;
 						foundRealChar = false;
 					}
-					else if (cw == mvarSettings.PropertySeparator)
+					else if (cw == mvarSettings.PropertySeparator && (mvarSettings.AllowTopLevelProperties || nextGroup != null))
 					{
 						if (nextPropertyName != null)
 						{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/DataFormats/RebelSoftware/InstallationScript/IAPDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/DataFormats/RebelSoftware/InstallationScript/IAPDataFormat.cs
index 8e82e186..166df9c3 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/DataFormats/RebelSoftware/InstallationScript/IAPDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/DataFormats/RebelSoftware/InstallationScript/IAPDataFormat.cs
@@ -37,7 +37,7 @@ namespace UniversalEditor.DataFormats.RebelSoftware.InstallationScript
 			this.Settings.PropertyNameValueSeparator = " ";
 
 			// Property separator is the newline character
-			this.Settings.PropertySeparator = "\r\n";
+			this.Settings.PropertySeparator = "\n";
 
 			// Do not allow top-level properties as property name/value separator (' ') conflicts with group definitions with spaces in them
 			this.Settings.AllowTopLevelProperties = false;
@@ -59,6 +59,7 @@ namespace UniversalEditor.DataFormats.RebelSoftware.InstallationScript
 				{
 					case "IA_Globals":
 					{
+						if (group.Properties["version"] != null) script.ProductVersion = new Version(group.Properties["version"].Value.ToString());
 						break;
 					}
 					case "IA_WelcomeDialog":