diff --git a/pkg/cmd/roachtest/tests/costfuzz.go b/pkg/cmd/roachtest/tests/costfuzz.go
index 5444c184267f..32cf40cede2e 100644
--- a/pkg/cmd/roachtest/tests/costfuzz.go
+++ b/pkg/cmd/roachtest/tests/costfuzz.go
@@ -27,6 +27,7 @@ import (
 
 func registerCostFuzz(r registry.Registry) {
 	for _, setupName := range []string{sqlsmith.RandTableSetupName, sqlsmith.SeedMultiRegionSetupName} {
+		setupName := setupName
 		var clusterSpec spec.ClusterSpec
 		switch setupName {
 		case sqlsmith.SeedMultiRegionSetupName:
diff --git a/pkg/cmd/roachtest/tests/query_comparison_util.go b/pkg/cmd/roachtest/tests/query_comparison_util.go
index 36af898719cd..d4807172f9b6 100644
--- a/pkg/cmd/roachtest/tests/query_comparison_util.go
+++ b/pkg/cmd/roachtest/tests/query_comparison_util.go
@@ -138,6 +138,7 @@ func runOneRoundQueryComparison(
 
 	rnd, seed := randutil.NewTestRand()
 	t.L().Printf("seed: %d", seed)
+	t.L().Printf("setupName: %s", qct.setupName)
 
 	setup := sqlsmith.Setups[qct.setupName](rnd)
 
diff --git a/pkg/cmd/roachtest/tests/unoptimized_query_oracle.go b/pkg/cmd/roachtest/tests/unoptimized_query_oracle.go
index 8e45d4e6b0d9..1feac200267e 100644
--- a/pkg/cmd/roachtest/tests/unoptimized_query_oracle.go
+++ b/pkg/cmd/roachtest/tests/unoptimized_query_oracle.go
@@ -42,6 +42,7 @@ func registerUnoptimizedQueryOracle(r registry.Registry) {
 	for i := range disableRuleSpecs {
 		disableRuleSpec := &disableRuleSpecs[i]
 		for _, setupName := range []string{sqlsmith.RandTableSetupName, sqlsmith.SeedMultiRegionSetupName} {
+			setupName := setupName
 			var clusterSpec spec.ClusterSpec
 			switch setupName {
 			case sqlsmith.SeedMultiRegionSetupName:
diff --git a/pkg/internal/sqlsmith/schema.go b/pkg/internal/sqlsmith/schema.go
index 4c5e91015978..b0f353a7b763 100644
--- a/pkg/internal/sqlsmith/schema.go
+++ b/pkg/internal/sqlsmith/schema.go
@@ -243,7 +243,7 @@ FROM
 			key := tree.MakeSchemaQualifiedTypeName(scName, name)
 			udtMapping[key] = typ
 		default:
-			return nil, errors.New("unsupported SQLSmith type kind")
+			return nil, errors.Newf("unsupported SQLSmith type kind: %s", string(membersRaw))
 		}
 	}
 	var udts []*types.T