diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LayerPosition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LayerPosition.cs
index a41857bf84..1ee7deb29a 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LayerPosition.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LayerPosition.cs
@@ -31,7 +31,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
 		/// <summary>
 		/// This layer contains the blinking caret.
 		/// </summary>
-		/// <remarks>This layer is above the Text layer. All items on this layer will blink with the same frequency as the caret.</remarks>
+		/// <remarks>This layer is above the Text layer.</remarks>
 		Caret
 	}
 	
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/TemplateCategoryComparer.cs b/src/Main/Base/Project/Src/Gui/Dialogs/TemplateCategoryComparer.cs
index 1d8d2d8add..946b91f2b9 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/TemplateCategoryComparer.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/TemplateCategoryComparer.cs
@@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				return 1;
 			}
 			
-			return String.Compare(categoryX.Name, categoryY.Name);
+			return String.Compare(categoryX.Name, categoryY.Name, StringComparison.CurrentCultureIgnoreCase);
 		}
 	}
 }
diff --git a/src/Main/Base/Test/Templates/FileTemplateCategoryComparerTests.cs b/src/Main/Base/Test/Templates/FileTemplateCategoryComparerTests.cs
index 8444ab9f05..30329a8b57 100644
--- a/src/Main/Base/Test/Templates/FileTemplateCategoryComparerTests.cs
+++ b/src/Main/Base/Test/Templates/FileTemplateCategoryComparerTests.cs
@@ -9,6 +9,7 @@ using System;
 namespace ICSharpCode.SharpDevelop.Tests.Templates
 {
 	[TestFixture]
+	[SetCulture("en-US")]
 	public class FileTemplateCategoryComparerTests
 	{
 		TemplateCategoryComparer comparer;
diff --git a/src/Main/Base/Test/Templates/ProjectTemplateCategoryComparerTests.cs b/src/Main/Base/Test/Templates/ProjectTemplateCategoryComparerTests.cs
index 5fca55b9fd..a16b7e2047 100644
--- a/src/Main/Base/Test/Templates/ProjectTemplateCategoryComparerTests.cs
+++ b/src/Main/Base/Test/Templates/ProjectTemplateCategoryComparerTests.cs
@@ -9,6 +9,7 @@ using System;
 namespace ICSharpCode.SharpDevelop.Tests.Templates
 {
 	[TestFixture]
+	[SetCulture("en-US")]
 	public class ProjectTemplateCategoryComparerTests
 	{
 		TemplateCategoryComparer comparer;