diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
index d8e8f76493..6efac20361 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
@@ -15,6 +15,7 @@
 		<Import assembly = ":ICSharpCode.SharpDevelop"/>
 	</Runtime>
 	
+	<!-- Add the "Boo" entry to the Open Project Dialog -->
 	<Path name = "/SharpDevelop/Workbench/Combine/FileFilter">
 		<FileFilter id         = "BooProject"
 		            insertbefore="AllFiles"
@@ -22,7 +23,8 @@
 		            class      = "ICSharpCode.SharpDevelop.Project.LoadProject"
 		            extensions = "*.booproj"/>
 	</Path>
-
+	
+	<!-- Add the "Boo" entry to the Open File Dialog -->
 	<Path name = "/SharpDevelop/Workbench/FileFilter">
 		<FileFilter id = "Boo"
 		            insertbefore="AllFiles"
@@ -30,11 +32,17 @@
 		            extensions = "*.boo"/>
 	</Path>
 	
+	<!-- Makes SharpDevelop show the text 'Compiling ProjectName...' whenever an MSBuild task named 'booc' is started -->
 	<Path name = "/SharpDevelop/MSBuildEngine/CompileTaskNames">
-		<!-- Makes SharpDevelop show the text 'Compiling ProjectName...' when the task is started -->
 		<String id="booc" text = "booc"/>
 	</Path>
 	
+	<!-- Register path to Boo.Microsoft.Build.targets for MSBuild engine. -->
+	<!-- Boo.Microsoft.Build.targets are in the AddIn directory -->
+	<Path name = "/SharpDevelop/MSBuildEngine/AdditionalProperties">
+		<String id="BooBinPath" text = "${AddInPath:ICSharpCode.BooBinding}"/>
+	</Path>
+	
 	<Path name = "/AddIns/FileTypeRegisterer/FileTypes">
 		<FiletypeAssociation
 			id = "booproj"
@@ -136,7 +144,7 @@
 		                 projectfileextension = ".booproj"
 		                 class                = "Grunwald.BooBinding.BooLanguageBinding" />
 	</Path>
-
+	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Tools/ConvertCode">
 		<ComplexCondition action = "Disable">
 			<Or>
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooProject.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooProject.cs
index 19973e98ea..9d761be105 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooProject.cs
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooProject.cs
@@ -18,17 +18,11 @@ namespace Grunwald.BooBinding
 {
 	public class BooProject : CompilableProject
 	{
-		static bool initialized = false;
 		public static readonly string BooBinPath = Path.GetDirectoryName(typeof(BooProject).Assembly.Location);
 		
 		void Init()
 		{
 			reparseCodeSensitiveProperties.Add("Ducky");
-			
-			if (!initialized) {
-				initialized = true;
-				MSBuildEngine.MSBuildProperties.Add("BooBinPath", BooBinPath);
-			}
 		}
 		
 		public override string Language {
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
index 4d64ad0ff8..9a74d5a9ff 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
@@ -351,7 +351,7 @@ namespace VBNetBinding.FormattingStrategy
 							if (Regex.IsMatch(texttoreplace.Trim(), statement.StartRegex, RegexOptions.IgnoreCase)) {
 								string indentation = GetIndentation(textArea, lineNr - 1);
 								if (isEndStatementNeeded(textArea, ref statement, lineNr)) {
-									textArea.Document.Insert(textArea.Caret.Offset, terminator + indentation + statement.EndStatement);
+									textArea.Document.Replace(curLine.Offset, curLine.Length, terminator + indentation + statement.EndStatement);
 									++undoCount;
 								}
 								for (int i = 0; i < statement.IndentPlus; i++) {
diff --git a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
index dec810b845..572ef20134 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
@@ -820,9 +820,28 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		internal static void InitializeMSBuildProject(MSBuild.Project project)
 		{
-			project.GlobalProperties.SetProperty("BuildingInsideVisualStudio", "true");
-			foreach (KeyValuePair<string, string> pair in MSBuildEngine.MSBuildProperties) {
-				project.GlobalProperties.SetProperty(pair.Key, pair.Value, true);
+			InitializeMSBuildProjectProperties(project.GlobalProperties);
+		}
+		
+		/// <summary>
+		/// Set compilation properties (MSBuildProperties and AddInTree/AdditionalPropertiesPath).
+		/// </summary>
+		internal static void InitializeMSBuildProjectProperties(MSBuild.BuildPropertyGroup propertyGroup)
+		{
+			foreach (KeyValuePair<string, string> entry in MSBuildEngine.MSBuildProperties) {
+				propertyGroup.SetProperty(entry.Key, entry.Value);
+			}
+			// re-load these properties from AddInTree every time because "text" might contain
+			// SharpDevelop properties resolved by the StringParser (e.g. ${property:FxCopPath})
+			AddInTreeNode node = AddInTree.GetTreeNode(MSBuildEngine.AdditionalPropertiesPath, false);
+			if (node != null) {
+				foreach (Codon codon in node.Codons) {
+					object item = codon.BuildItem(null, new System.Collections.ArrayList());
+					if (item != null) {
+						bool escapeValue = !codon.Properties.Get("text", "").Contains("$(");
+						propertyGroup.SetProperty(codon.Id, item.ToString(), escapeValue);
+					}
+				}
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs
index e348149586..252b22e865 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs
@@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		const string CompileTaskNamesPath = "/SharpDevelop/MSBuildEngine/CompileTaskNames";
 		const string AdditionalTargetFilesPath = "/SharpDevelop/MSBuildEngine/AdditionalTargetFiles";
 		const string AdditionalLoggersPath = "/SharpDevelop/MSBuildEngine/AdditionalLoggers";
-		const string AdditionalPropertiesPath = "/SharpDevelop/MSBuildEngine/AdditionalProperties";
+		internal const string AdditionalPropertiesPath = "/SharpDevelop/MSBuildEngine/AdditionalProperties";
 		
 		/// <summary>
 		/// Gets a list of the task names that cause a "Compiling ..." log message.
@@ -69,6 +69,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			
 			MSBuildProperties = new SortedList<string, string>();
 			MSBuildProperties.Add("SharpDevelopBinPath", Path.GetDirectoryName(typeof(MSBuildEngine).Assembly.Location));
+			MSBuildProperties.Add("BuildingInsideVisualStudio", "true");
 		}
 		
 		#region Properties
@@ -373,21 +374,9 @@ namespace ICSharpCode.SharpDevelop.Project
 			internal Engine CreateEngine()
 			{
 				Engine engine = MSBuildInternals.CreateEngine();
-				foreach (KeyValuePair<string, string> entry in MSBuildProperties) {
-					engine.GlobalProperties.SetProperty(entry.Key, entry.Value);
-				}
-				// re-load these properties from AddInTree every time because "text" might contain
-				// SharpDevelop properties resolved by the StringParser (e.g. ${property:FxCopPath})
-				AddInTreeNode node = AddInTree.GetTreeNode(AdditionalPropertiesPath, false);
-				if (node != null) {
-					foreach (Codon codon in node.Codons) {
-						object item = codon.BuildItem(null, new System.Collections.ArrayList());
-						if (item != null) {
-							bool escapeValue = !codon.Properties.Get("text", "").Contains("$(");
-							engine.GlobalProperties.SetProperty(codon.Id, item.ToString(), escapeValue);
-						}
-					}
-				}
+				
+				MSBuildBasedProject.InitializeMSBuildProjectProperties(engine.GlobalProperties);
+				
 				if (options.AdditionalProperties != null) {
 					foreach (KeyValuePair<string, string> entry in options.AdditionalProperties) {
 						engine.GlobalProperties.SetProperty(entry.Key, entry.Value);
@@ -398,8 +387,6 @@ namespace ICSharpCode.SharpDevelop.Project
 				engine.GlobalProperties.SetProperty("SolutionFileName", Path.GetFileName(solution.FileName));
 				engine.GlobalProperties.SetProperty("SolutionPath", solution.FileName);
 				
-				engine.GlobalProperties.SetProperty("BuildingInsideVisualStudio", "true");
-				
 				return engine;
 			}
 			
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/ConstructedReturnType.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/ConstructedReturnType.cs
index 8adc0384bf..ac9a14d008 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/ConstructedReturnType.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/ConstructedReturnType.cs
@@ -72,17 +72,21 @@ namespace ICSharpCode.SharpDevelop.Dom
 			}
 		}
 		
+		/// <summary>
+		/// Gets if <paramref name="t"/> is/contains a generic return type referring to a class type parameter.
+		/// </summary>
 		bool CheckReturnType(IReturnType t)
 		{
+			if (t == null) {
+				return false;
+			}
 			if (t.IsGenericReturnType) {
 				return t.CastToGenericReturnType().TypeParameter.Method == null;
 			} else if (t.IsArrayReturnType) {
 				return CheckReturnType(t.CastToArrayReturnType().ArrayElementType);
 			} else if (t.IsConstructedReturnType) {
 				foreach (IReturnType para in t.CastToConstructedReturnType().TypeArguments) {
-					if (para != null) {
-						if (CheckReturnType(para)) return true;
-					}
+					if (CheckReturnType(para)) return true;
 				}
 				return false;
 			} else {