diff --git a/backup.go b/backup.go
index ae05335..654b006 100644
--- a/backup.go
+++ b/backup.go
@@ -389,7 +389,7 @@ func xbackupctl(ctx context.Context, xctl *ctl) {
 	srcAcmeDir := filepath.Join(srcDataDir, "acme")
 	if _, err := os.Stat(srcAcmeDir); err == nil {
 		backupDir("acme")
-	} else if err != nil && !os.IsNotExist(err) {
+	} else if !os.IsNotExist(err) {
 		xerrx("copying acme/", err)
 	}
 
diff --git a/main.go b/main.go
index 073993a..6d79e09 100644
--- a/main.go
+++ b/main.go
@@ -3974,7 +3974,7 @@ Opens database files directly, not going through a running mox instance.
 			return nil
 		}
 
-		wq := moxio.NewWorkQueue[store.Message, threadPrep](procs, workqueuesize, prepareMessages, processMessage)
+		wq := moxio.NewWorkQueue(procs, workqueuesize, prepareMessages, processMessage)
 
 		err = a.DB.Write(context.Background(), func(tx *bstore.Tx) error {
 			q := bstore.QueryTx[store.Message](tx)
diff --git a/verifydata.go b/verifydata.go
index 15c22ae..cff8476 100644
--- a/verifydata.go
+++ b/verifydata.go
@@ -348,7 +348,7 @@ possibly making them potentially no longer readable by the previous version.
 					if du.MessageSize != totalSize {
 						checkf(errors.New(`wrong total message size, see mox recalculatemailboxcounts"`), dbpath, "account has wrong total message size %d, should be %d", du.MessageSize, totalSize)
 					}
-				} else if err != nil && !errors.Is(err, bstore.ErrAbsent) {
+				} else if !errors.Is(err, bstore.ErrAbsent) {
 					checkf(err, dbpath, "get disk usage")
 				}
 			}