diff --git a/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs b/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs
index 8060552a..deebd59c 100644
--- a/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs
+++ b/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs
@@ -58,7 +58,7 @@ namespace LibationAvalonia.ViewModels
 				await Dispatcher.UIThread.InvokeAsync(() => LibraryStats = stats);
 
 				if (Configuration.Instance.AutoDownloadEpisodes
-					&& stats.booksNoProgress + stats.pdfsNotDownloaded > 0)
+					&& stats.PendingBooks + stats.pdfsNotDownloaded > 0)
 					await Dispatcher.UIThread.InvokeAsync(BackupAllBooks);
 			}
 		}
diff --git a/Source/LibationWinForms/Form1._NonUI.cs b/Source/LibationWinForms/Form1._NonUI.cs
index 3c91142d..7d362b60 100644
--- a/Source/LibationWinForms/Form1._NonUI.cs
+++ b/Source/LibationWinForms/Form1._NonUI.cs
@@ -32,8 +32,8 @@ namespace LibationWinForms
 
                 var libraryStats = e.Result as LibraryCommands.LibraryStats;
 
-                if ((libraryStats.booksNoProgress + libraryStats.pdfsNotDownloaded) > 0)
-                    beginBookBackupsToolStripMenuItem_Click();
+                if ((libraryStats.PendingBooks + libraryStats.pdfsNotDownloaded) > 0)
+                    Invoke(() => beginBookBackupsToolStripMenuItem_Click(null, System.EventArgs.Empty));
             };
 		}
 
diff --git a/Source/LibationWinForms/Form1.cs b/Source/LibationWinForms/Form1.cs
index 33b06b0e..876e2ca8 100644
--- a/Source/LibationWinForms/Form1.cs
+++ b/Source/LibationWinForms/Form1.cs
@@ -84,7 +84,7 @@ namespace LibationWinForms
 		public async Task InitLibraryAsync(List<LibraryBook> libraryBooks)
 		{
 			runBackupCountsAgain = true;
-			updateCountsBw.RunWorkerAsync(libraryBooks);
+			setBackupCounts(null, libraryBooks);
 			await productsDisplay.DisplayAsync(libraryBooks);
 		}