diff --git a/data/templates/file/Misc/AppConfigFile.xft b/data/templates/file/Misc/AppConfigFile.xft
index 58638f56c6..e1e40a26c6 100644
--- a/data/templates/file/Misc/AppConfigFile.xft
+++ b/data/templates/file/Misc/AppConfigFile.xft
@@ -7,7 +7,7 @@
 		  defaultname	= "app.config"
 		  language	= "XML"/>
 	 
-	<Description>${res:Templates.File.Xml.AppConfigFile.Description}</Description>
+	<Description>${res:Templates.File.Xml.AppConfig.Description}</Description>
 
 	<Files>
 		<File name="${FullName}" language="XML"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
diff --git a/src/Main/Base/Project/Src/Project/BuildEngine.cs b/src/Main/Base/Project/Src/Project/BuildEngine.cs
index c853b0043e..47f936d909 100644
--- a/src/Main/Base/Project/Src/Project/BuildEngine.cs
+++ b/src/Main/Base/Project/Src/Project/BuildEngine.cs
@@ -531,7 +531,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				combinedBuildFeedbackSink.Done(results.Result == BuildResultCode.Success);
 			}
 			if (options.Callback != null) {
-				Gui.WorkbenchSingleton.MainForm.BeginInvoke(options.Callback, results);
+				Gui.WorkbenchSingleton.SafeThreadAsyncCall(r => options.Callback(r), results);
 			}
 		}
 		#endregion