diff --git a/provider/chainsched/chain_sched.go b/provider/chainsched/chain_sched.go
index 559a0274f..238baac54 100644
--- a/provider/chainsched/chain_sched.go
+++ b/provider/chainsched/chain_sched.go
@@ -66,13 +66,13 @@ func (s *ProviderChainSched) Run(ctx context.Context) {
 			}
 
 			gotCur = false
-			log.Info("restarting window post scheduler")
+			log.Info("restarting chain scheduler")
 		}
 
 		select {
 		case changes, ok := <-notifs:
 			if !ok {
-				log.Warn("window post scheduler notifs channel closed")
+				log.Warn("chain notifs channel closed")
 				notifs = nil
 				continue
 			}
@@ -124,7 +124,7 @@ func (s *ProviderChainSched) Run(ctx context.Context) {
 
 func (s *ProviderChainSched) update(ctx context.Context, revert, apply *types.TipSet) {
 	if apply == nil {
-		log.Error("no new tipset in window post ProviderChainSched.update")
+		log.Error("no new tipset in ProviderChainSched.update")
 		return
 	}
 
diff --git a/provider/lpmessage/watch.go b/provider/lpmessage/watch.go
index ee8d33237..7c7478645 100644
--- a/provider/lpmessage/watch.go
+++ b/provider/lpmessage/watch.go
@@ -44,7 +44,7 @@ func NewMessageWatcher(db *harmonydb.DB, ht *harmonytask.TaskEngine, pcs *chains
 		stopped:  make(chan struct{}),
 		updateCh: make(chan struct{}),
 	}
-	mw.run()
+	go mw.run()
 	if err := pcs.AddHandler(mw.processHeadChange); err != nil {
 		return nil, err
 	}
@@ -107,7 +107,7 @@ func (mw *MessageWatcher) update() {
 	}
 
 	// really large limit in case of things getting stuck and backlogging severely
-	err = mw.db.Select(ctx, &msgs, `SELECT signed_message_cid, from_key, nonce FROM message_wait
+	err = mw.db.Select(ctx, &msgs, `SELECT signed_message_cid, from_key, nonce FROM message_waits
                           JOIN message_sends ON signed_message_cid = signed_cid
                           WHERE waiter_machine_id = $1 LIMIT 10000`, machineID)
 	if err != nil {