diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
index 92acad7f0f9cc..3ac3ef0a2b455 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -3121,7 +3121,7 @@ class Analyzer(
         copy: Array[String] => TableChange): Option[TableChange] = {
       val fieldOpt = schema.findNestedField(
         fieldNames, includeCollections = true, conf.resolver)
-      fieldOpt.map { case (path, field) => copy(path +: field.name) }
+      fieldOpt.map { case (path, field) => copy((path :+ field.name).toArray) }
     }
   }
 }
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
index d6fc1dc6ddc3d..63b893d809db8 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
@@ -434,7 +434,7 @@ trait CheckAnalysis extends PredicateHelper {
                 throw new AnalysisException(
                   s"Cannot $operation missing field in ${table.name} schema: ${fieldName.quoted}")
               }
-              field.get
+              field.get._2
             }
 
             alter.changes.foreach {