diff --git a/ActiveDirectoryProvider/ActiveDirectoryProvider.cs b/ActiveDirectoryProvider/ActiveDirectoryProvider.cs
index 733df74..cd8bca2 100644
--- a/ActiveDirectoryProvider/ActiveDirectoryProvider.cs
+++ b/ActiveDirectoryProvider/ActiveDirectoryProvider.cs
@@ -743,7 +743,7 @@ namespace ScrewTurn.Wiki.Plugins.ActiveDirectory {
 		/// </summary>
 		/// <value>The information</value>
 		public ComponentInformation Information {
-			get { return new ComponentInformation("Active Directory Provider", "Threeplicate Srl", "3.0.2.509", "http://www.screwturn.eu", "http://www.screwturn.eu/Version/ADProv/ADProv.txt"); }
+			get { return new ComponentInformation("Active Directory Provider", "Threeplicate Srl", "3.0.2.518", "http://www.screwturn.eu", "http://www.screwturn.eu/Version/ADProv/ADProv.txt"); }
 		}
 
 
@@ -861,7 +861,7 @@ namespace ScrewTurn.Wiki.Plugins.ActiveDirectory {
 						continue;
 					}
 
-					string key = configEntry[0].Trim().ToLower();
+					string key = configEntry[0].Trim().ToLowerInvariant();
 					string value = configEntry[1].Trim();
 
 					switch(key) {
diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index b3b3c41..3b99139 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.2.517")]
-[assembly: AssemblyFileVersion("3.0.2.517")]
+[assembly: AssemblyVersion("3.0.2.518")]
+[assembly: AssemblyFileVersion("3.0.2.518")]
diff --git a/Core/Settings.cs b/Core/Settings.cs
index d1ea6d1..32f03b0 100644
--- a/Core/Settings.cs
+++ b/Core/Settings.cs
@@ -604,8 +604,8 @@ namespace ScrewTurn.Wiki {
 				string virtualDirectory = HttpContext.Current.Request.ApplicationPath;
 				// We need to convert the case of the virtual directory to that used in the url
 				// Return the virtual directory as is if we can't find it in the URL
-				if (requestUrl.ToLower().Contains(virtualDirectory.ToLower())) {
-					return requestUrl.Substring(requestUrl.ToLower().IndexOf(virtualDirectory.ToLower()),virtualDirectory.Length);
+				if(requestUrl.ToLowerInvariant().Contains(virtualDirectory.ToLowerInvariant())) {
+					return requestUrl.Substring(requestUrl.ToLowerInvariant().IndexOf(virtualDirectory.ToLowerInvariant()), virtualDirectory.Length);
 				}
 				return virtualDirectory;
 			}
diff --git a/WebApplication/Edit.aspx.cs b/WebApplication/Edit.aspx.cs
index cf21cb1..25c1cc4 100644
--- a/WebApplication/Edit.aspx.cs
+++ b/WebApplication/Edit.aspx.cs
@@ -787,7 +787,7 @@ namespace ScrewTurn.Wiki {
 			btnCancelTemplate_Click(sender, e);
 			// If there's a category matching the selected template name, select it automatically
 			for (int i = 0; i < lstCategories.Items.Count; i++)	{
-				if (lstCategories.Items[i].Value.ToLower().Trim() == lstTemplates.SelectedValue.ToLower().Trim()) {
+				if(lstCategories.Items[i].Value.ToLowerInvariant().Trim() == lstTemplates.SelectedValue.ToLowerInvariant().Trim()) {
 					lstCategories.Items[i].Selected = true;
 				}
 			}
diff --git a/WebApplication/GetFile.aspx.cs b/WebApplication/GetFile.aspx.cs
index 692c81f..0b828c9 100644
--- a/WebApplication/GetFile.aspx.cs
+++ b/WebApplication/GetFile.aspx.cs
@@ -96,7 +96,7 @@ namespace ScrewTurn.Wiki {
 			string mime = "";
 			try {
 				string ext = Path.GetExtension(filename);
-				if(ext.StartsWith(".")) ext = ext.Substring(1).ToLower(); // Remove trailing dot
+				if(ext.StartsWith(".")) ext = ext.Substring(1).ToLowerInvariant(); // Remove trailing dot
 				mime = GetMimeType(ext);
 			}
 			catch {
diff --git a/WebApplication/Popup.aspx.cs b/WebApplication/Popup.aspx.cs
index eb2e66e..85ffa33 100644
--- a/WebApplication/Popup.aspx.cs
+++ b/WebApplication/Popup.aspx.cs
@@ -83,11 +83,11 @@ namespace ScrewTurn.Wiki {
 			string temp = Request["Feature"];
 			string feature = "", parms = "";
 			if(temp.Contains("$")) {
-				feature = temp.Substring(0, temp.IndexOf("$")).ToLower();
+				feature = temp.Substring(0, temp.IndexOf("$")).ToLowerInvariant();
 				parms = temp.Substring(temp.IndexOf("$") + 1);
 			}
 			else {
-				feature = temp.ToLower();
+				feature = temp.ToLowerInvariant();
 			}
 
 			switch(feature) {
@@ -290,7 +290,7 @@ namespace ScrewTurn.Wiki {
 		}
 
 		private bool IsImage(string name) {
-			string ext = System.IO.Path.GetExtension(name.ToLower());
+			string ext = System.IO.Path.GetExtension(name.ToLowerInvariant());
 			return ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" || ext == ".tif" || ext == ".tiff";
 		}
 
diff --git a/WebApplication/PopupWYSIWYG.aspx.cs b/WebApplication/PopupWYSIWYG.aspx.cs
index 3234392..09210b9 100644
--- a/WebApplication/PopupWYSIWYG.aspx.cs
+++ b/WebApplication/PopupWYSIWYG.aspx.cs
@@ -84,11 +84,11 @@ namespace ScrewTurn.Wiki {
 			string temp = Request["Feature"];
 			string feature = "", parms = "";
 			if(temp.Contains("$")) {
-				feature = temp.Substring(0, temp.IndexOf("$")).ToLower();
+				feature = temp.Substring(0, temp.IndexOf("$")).ToLowerInvariant();
 				parms = temp.Substring(temp.IndexOf("$") + 1);
 			}
 			else {
-				feature = temp.ToLower();
+				feature = temp.ToLowerInvariant();
 			}
 
 			switch(feature) {
@@ -289,7 +289,7 @@ namespace ScrewTurn.Wiki {
 		}
 
 		private bool IsImage(string name) {
-			string ext = System.IO.Path.GetExtension(name.ToLower());
+			string ext = System.IO.Path.GetExtension(name.ToLowerInvariant());
 			return ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".png" || ext == ".tif" || ext == ".tiff";
 		}
 
diff --git a/WebApplication/Thumb.aspx.cs b/WebApplication/Thumb.aspx.cs
index deaae35..0bc21ce 100644
--- a/WebApplication/Thumb.aspx.cs
+++ b/WebApplication/Thumb.aspx.cs
@@ -56,7 +56,7 @@ namespace ScrewTurn.Wiki {
 
 			string size = Request["Size"];
 			if(string.IsNullOrEmpty(size)) size = "small";
-			size = size.ToLower();
+			size = size.ToLowerInvariant();
 
 			// Verify permissions
 			bool canDownload = false;