diff --git a/ModernKeePass.Application/Database/Commands/CreateDatabase/CreateDatabaseCommand.cs b/ModernKeePass.Application/Database/Commands/CreateDatabase/CreateDatabaseCommand.cs
index 3037ace..809d15a 100644
--- a/ModernKeePass.Application/Database/Commands/CreateDatabase/CreateDatabaseCommand.cs
+++ b/ModernKeePass.Application/Database/Commands/CreateDatabase/CreateDatabaseCommand.cs
@@ -64,17 +64,17 @@ namespace ModernKeePass.Application.Database.Commands.CreateDatabase
                     _database.UpdateGroup(internetGroup);
 
                     var sample1 = _database.CreateEntry(_database.RootGroupId);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Title, "Sample Entry", false);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.UserName, "Username", false);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Password, "Password", true);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Url, "https://keepass.info/", false);
-                    _database.UpdateEntry(sample1.Id, EntryFieldName.Notes, "You may safely delete this sample", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Title, "Sample Entry", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.UserName, "Username", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Password, "Password", true);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Url, "https://keepass.info/", false);
+                    await _database.UpdateEntry(sample1.Id, EntryFieldName.Notes, "You may safely delete this sample", false);
 
                     var sample2 = _database.CreateEntry(_database.RootGroupId);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.Title, "Sample Entry #2", false);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.UserName, "Michael321", false);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.Password, "12345", true);
-                    _database.UpdateEntry(sample2.Id, EntryFieldName.Url, "https://keepass.info/help/kb/testform.html", false);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.Title, "Sample Entry #2", false);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.UserName, "Michael321", false);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.Password, "12345", true);
+                    await _database.UpdateEntry(sample2.Id, EntryFieldName.Url, "https://keepass.info/help/kb/testform.html", false);
                 }
             }
         }
diff --git a/ModernKeePass/App.xaml.cs b/ModernKeePass/App.xaml.cs
index 64df110..b1edc2f 100644
--- a/ModernKeePass/App.xaml.cs
+++ b/ModernKeePass/App.xaml.cs
@@ -210,7 +210,7 @@ namespace ModernKeePass
             }
             catch (Exception ex)
             {
-                _log.LogError(ex);
+                await _log.LogError(ex);
             }
             finally
             {
diff --git a/WinAppCommon/ViewModels/UserControls/ColorPickerControlVm.cs b/WinAppCommon/ViewModels/UserControls/ColorPickerControlVm.cs
index 4518d6b..5129cc6 100644
--- a/WinAppCommon/ViewModels/UserControls/ColorPickerControlVm.cs
+++ b/WinAppCommon/ViewModels/UserControls/ColorPickerControlVm.cs
@@ -10,7 +10,7 @@ namespace ModernKeePass.ViewModels
     {
         private Color _selectedItem;
 
-        public class Color
+        public sealed class Color
         {
             public string ColorName { get; set; }
             public SolidColorBrush ColorBrush { get; set; }