diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs
index 3e0e5bf572..63a227dfee 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs
@@ -353,7 +353,7 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
 			return -1;
 		}
 		
-		bool CamelCaseMatch(string text, string query)
+		static bool CamelCaseMatch(string text, string query)
 		{
 			int i = 0;
 			foreach (char upper in text.Where(c => char.IsUpper(c))) {
diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs
index d5a1630b3c..1fe3b4b128 100755
--- a/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs
@@ -180,7 +180,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			get { return projectMinimumSolutionVersion; }
 		}
 		
-		List<string> interestingTasks = new List<string>();
+		HashSet<string> interestingTasks = new HashSet<string>();
 		string temporaryFileName;
 		
 		/// <summary>
diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildLoggerFilter.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildLoggerFilter.cs
index 63487e9701..1c6b5ffda3 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildLoggerFilter.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildLoggerFilter.cs
@@ -81,6 +81,8 @@ namespace ICSharpCode.SharpDevelop.Project
 			{
 				if (nextFilter == null)
 					throw new ArgumentNullException("nextFilter");
+				// ensure the engine gets notified about start/end of this task
+				engine.InterestingTasks.Add(taskname);
 				// Create a Filter that tracks whether the task is active.
 				// If active, forward to 'baseFilter', otherwise forward to 'nextFilter'.
 				return new TaskBoundLoggerFilter(this, engine, nextFilter);