diff --git a/clean.cmd b/clean.cmd
index 042d2b324..17718672f 100644
--- a/clean.cmd
+++ b/clean.cmd
@@ -61,6 +61,9 @@ rmdir .\projects\GKMap\GKMap.WinForms\obj /s /q
 rmdir .\projects\GKMap\GKMap.EtoForms\bin /s /q
 rmdir .\projects\GKMap\GKMap.EtoForms\obj /s /q
 
+rmdir .\projects\GKMap\GKMap.Xamarin\bin /s /q
+rmdir .\projects\GKMap\GKMap.Xamarin\obj /s /q
+
 rem <<< GKv3 >>>
 
 rmdir .\projects\GKv3\.vs /s /q
diff --git a/projects/GKCore/GDModel/GDMLocationName.cs b/projects/GKCore/GDModel/GDMLocationName.cs
index dc9a304eb..21e9533fc 100644
--- a/projects/GKCore/GDModel/GDMLocationName.cs
+++ b/projects/GKCore/GDModel/GDMLocationName.cs
@@ -25,9 +25,16 @@ namespace GDModel
 {
     public sealed class GDMLocationName : GDMValueTag
     {
+        private string fAbbreviation;
         private readonly GDMDateValue fDate;
         private GDMLanguageID fLanguage;
 
+        public string Abbreviation
+        {
+            get { return fAbbreviation; }
+            set { fAbbreviation = value; }
+        }
+
         public GDMDateValue Date
         {
             get { return fDate; }
@@ -67,6 +74,7 @@ public override void Assign(GDMTag source)
                 throw new ArgumentException(@"Argument is null or wrong type", "source");
 
             base.Assign(sourceObj);
+            fAbbreviation = sourceObj.fAbbreviation;
             fDate.Assign(sourceObj.fDate);
             fLanguage = sourceObj.fLanguage;
         }
@@ -74,13 +82,14 @@ public override void Assign(GDMTag source)
         public override void Clear()
         {
             base.Clear();
+            fAbbreviation = string.Empty;
             fDate.Clear();
             fLanguage = GDMLanguageID.Unknown;
         }
 
         public override bool IsEmpty()
         {
-            return base.IsEmpty() && fDate.IsEmpty() && (fLanguage == GDMLanguageID.Unknown);
+            return base.IsEmpty() && fDate.IsEmpty() && string.IsNullOrEmpty(fAbbreviation) && (fLanguage == GDMLanguageID.Unknown);
         }
 
         public override void ReplaceXRefs(GDMXRefReplacer map)
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs b/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
index 34b0c6366..647e38a8b 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
@@ -125,7 +125,8 @@ public override async Task<bool> ShowModalAsync(ICommonDialog dialog, IView owne
                 }
             }
 
-            UIHelper.CenterFormByParent((Form)dialog, mainHandle);
+            // for WinForms works better without this
+            //UIHelper.CenterFormByParent((Form)dialog, mainHandle);
 
             wfModal.ShowDialog(owner as IWin32Window);
             return await wfModal.DialogResultTask;
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs b/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
index 308963e50..ba17877e7 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
@@ -201,6 +201,7 @@ public override async Task<bool> ShowModalAsync(ICommonDialog dialog, IView owne
 #endif
             }*/
 
+            // for EtoForms works without this (Win10)
             //UIHelper.CenterFormByParent((Window)form, mainHandle);
 
             efModal.ShowModal(owner as Control);