diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/Device.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/Device.cs
index 00031f170f..ed8a7d04cd 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/Device.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/Device.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Globalization;
 using System.Text;
 using System.Windows;
 
@@ -50,6 +51,7 @@ namespace FancyZonesEditor.Utils
         {
             float dpi = Dpi != 0 ? Dpi : 96f;
             double scaleFactor = 96f / dpi;
+
             return Math.Round(coordinate * scaleFactor);
         }
 
@@ -57,23 +59,17 @@ namespace FancyZonesEditor.Utils
         {
             var sb = new StringBuilder();
 
-            sb.Append("ID: ");
-            sb.AppendLine(Id);
-            sb.Append("DPI: ");
-            sb.AppendLine(Dpi.ToString());
-            sb.Append("Is primary: ");
-            sb.AppendLine(Primary.ToString());
+            sb.AppendFormat(CultureInfo.InvariantCulture, "ID: {0}{1}", Id, Environment.NewLine);
+            sb.AppendFormat(CultureInfo.InvariantCulture, "DPI: {0}{1}", Dpi, Environment.NewLine);
+            sb.AppendFormat(CultureInfo.InvariantCulture, "Is primary: {0}{1}", Primary, Environment.NewLine);
 
-            string workArea = string.Format("({0}, {1}, {2}, {3})", WorkAreaRect.X, WorkAreaRect.Y, WorkAreaRect.Width, WorkAreaRect.Height);
-            string bounds = string.Format("({0}, {1}, {2}, {3})", UnscaledBounds.X, UnscaledBounds.Y, UnscaledBounds.Width, UnscaledBounds.Height);
-            string scaledBounds = string.Format("({0}, {1}, {2}, {3})", ScaledBounds.X, ScaledBounds.Y, ScaledBounds.Width, ScaledBounds.Height);
+            string workArea = string.Format(CultureInfo.InvariantCulture, "({0}, {1}, {2}, {3})", WorkAreaRect.X, WorkAreaRect.Y, WorkAreaRect.Width, WorkAreaRect.Height);
+            string bounds = string.Format(CultureInfo.InvariantCulture, "({0}, {1}, {2}, {3})", UnscaledBounds.X, UnscaledBounds.Y, UnscaledBounds.Width, UnscaledBounds.Height);
+            string scaledBounds = string.Format(CultureInfo.InvariantCulture, "({0}, {1}, {2}, {3})", ScaledBounds.X, ScaledBounds.Y, ScaledBounds.Width, ScaledBounds.Height);
 
-            sb.Append("Work area: ");
-            sb.AppendLine(workArea);
-            sb.Append("Unscaled bounds: ");
-            sb.AppendLine(bounds);
-            sb.Append("Scaled bounds: ");
-            sb.AppendLine(scaledBounds);
+            sb.AppendFormat(CultureInfo.InvariantCulture, "Work area: {0}{1}", workArea, Environment.NewLine);
+            sb.AppendFormat(CultureInfo.InvariantCulture, "Unscaled bounds: {0}{1}", bounds, Environment.NewLine);
+            sb.AppendFormat(CultureInfo.InvariantCulture, "Scaled bounds: {0}{1}", scaledBounds, Environment.NewLine);
 
             return sb.ToString();
         }
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs
index 9c900623b8..61d3ac76bd 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs
@@ -78,7 +78,7 @@ namespace FancyZonesEditor.Models
         {
             get
             {
-                return "{" + Guid.ToString().ToUpper() + "}";
+                return "{" + Guid.ToString().ToUpperInvariant() + "}";
             }
         }
 
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/MainWindowSettingsModel.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/MainWindowSettingsModel.cs
index 7eb01a7e67..c969ee3f5f 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/MainWindowSettingsModel.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/MainWindowSettingsModel.cs
@@ -378,7 +378,7 @@ namespace FancyZonesEditor
             {
                 foreach (LayoutModel model in MainWindowSettingsModel.CustomModels)
                 {
-                    if ("{" + model.Guid.ToString().ToUpper() + "}" == currentApplied.ZonesetUuid.ToUpper())
+                    if ("{" + model.Guid.ToString().ToUpperInvariant() + "}" == currentApplied.ZonesetUuid.ToUpperInvariant())
                     {
                         // found match
                         foundModel = model;
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs
index a34886565a..54e9ecd492 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs
@@ -377,7 +377,7 @@ namespace FancyZonesEditor.Utils
                     string uuid = current.GetProperty(UuidJsonTag).GetString();
                     var info = current.GetProperty(InfoJsonTag);
 
-                    if (type.Equals(GridJsonTag))
+                    if (type.Equals(GridJsonTag, StringComparison.OrdinalIgnoreCase))
                     {
                         bool error = false;
 
@@ -449,13 +449,13 @@ namespace FancyZonesEditor.Utils
                         if (error)
                         {
                             App.ShowExceptionMessageBox(string.Format(Properties.Resources.Error_Layout_Malformed_Data, name));
-                            deleted.Add(Guid.Parse(uuid).ToString().ToUpper());
+                            deleted.Add(Guid.Parse(uuid).ToString().ToUpperInvariant());
                             continue;
                         }
 
                         custom.Add(new GridLayoutModel(uuid, name, LayoutType.Custom, rows, columns, rowsPercentage, columnsPercentage, cellChildMap));
                     }
-                    else if (type.Equals(CanvasJsonTag))
+                    else if (type.Equals(CanvasJsonTag, StringComparison.OrdinalIgnoreCase))
                     {
                         int workAreaWidth = info.GetProperty(RefWidthJsonTag).GetInt32();
                         int workAreaHeight = info.GetProperty(RefHeightJsonTag).GetInt32();
@@ -489,7 +489,7 @@ namespace FancyZonesEditor.Utils
                         if (error)
                         {
                             App.ShowExceptionMessageBox(string.Format(Properties.Resources.Error_Layout_Malformed_Data, name));
-                            deleted.Add(Guid.Parse(uuid).ToString().ToUpper());
+                            deleted.Add(Guid.Parse(uuid).ToString().ToUpperInvariant());
                             continue;
                         }