diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7b9b54a19bb..dc2968add81 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -72,6 +72,7 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/vttablet/tabletmanager/rpc_throttler.go @shlomi-noach @mattlord @timvaillancourt
 /go/vt/vttablet/tabletserver/throttle @shlomi-noach @mattlord @timvaillancourt
 /go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord
+/go/vt/vttablet/tabletmanager/vdiff @rohit-nayak-ps @mattlord
 /go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord
 /go/vt/vttablet/tabletserver* @harshit-gangal @systay @shlomi-noach @rohit-nayak-ps @timvaillancourt
 /go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
diff --git a/go/vt/vtctl/workflow/traffic_switcher_test.go b/go/vt/vtctl/workflow/traffic_switcher_test.go
index a7da91174b9..eb8c877e255 100644
--- a/go/vt/vtctl/workflow/traffic_switcher_test.go
+++ b/go/vt/vtctl/workflow/traffic_switcher_test.go
@@ -966,7 +966,8 @@ func TestCancelMigration_TABLES(t *testing.T) {
 	err = topo.CheckKeyspaceLocked(ctx, ts.sourceKeyspace)
 	require.NoError(t, err)
 
-	ts.cancelMigration(ctx, sm)
+	err = ts.cancelMigration(ctx, sm)
+	require.NoError(t, err)
 
 	// Expect the queries to be cleared
 	assert.Empty(t, env.tmc.vrQueries[100])
@@ -1027,7 +1028,8 @@ func TestCancelMigration_SHARDS(t *testing.T) {
 	err = topo.CheckKeyspaceLocked(ctx, ts.sourceKeyspace)
 	require.NoError(t, err)
 
-	ts.cancelMigration(ctx, sm)
+	err = ts.cancelMigration(ctx, sm)
+	require.NoError(t, err)
 
 	// Expect the queries to be cleared
 	assert.Empty(t, env.tmc.vrQueries[100])