diff --git a/src/AksArc/AksArc.Autorest/custom/Invoke-AzAksArcClusterUpgrade.ps1 b/src/AksArc/AksArc.Autorest/custom/Invoke-AzAksArcClusterUpgrade.ps1
index 639d9f0e6813..d6ef0b1d1f8d 100644
--- a/src/AksArc/AksArc.Autorest/custom/Invoke-AzAksArcClusterUpgrade.ps1
+++ b/src/AksArc/AksArc.Autorest/custom/Invoke-AzAksArcClusterUpgrade.ps1
@@ -121,11 +121,9 @@ function Invoke-AzAksArcClusterUpgrade {
         if ($PSBoundParameters.ContainsKey("KubernetesVersion"))
         {   
             $Upgrades = Get-AzAksArcClusterUpgrade -ClusterName $ClusterName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-            if ($upgrades.ControlPlaneProfileUpgrade.KubernetesVersion -contains $KubernetesVersion) {
-                continue
-            } else {
+            if (!($upgrades.ControlPlaneProfileUpgrade.KubernetesVersion -contains $KubernetesVersion)) {
                 throw "Kubernetes Version $KubernetesVersion is not a valid upgradable version."
-            }
+            } 
         } else {
             $Upgrades = Get-AzAksArcClusterUpgrade -ClusterName $ClusterName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
             $UpgradeListLength = $upgrades.ControlPlaneProfileUpgrade.KubernetesVersion.Length
@@ -137,8 +135,7 @@ function Invoke-AzAksArcClusterUpgrade {
     
             $null = $PSBoundParameters.Add("KubernetesVersion", $LatestUpgrade)
         }
-    
+        
         Az.AksArc.internal\Update-AzAksArcCluster @PSBoundParameters
     }
-    }
-    
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/src/AksArc/AksArc.Autorest/custom/New-AzAksArcCluster.ps1 b/src/AksArc/AksArc.Autorest/custom/New-AzAksArcCluster.ps1
index 3c40901d8c1c..0dfeffb1b373 100644
--- a/src/AksArc/AksArc.Autorest/custom/New-AzAksArcCluster.ps1
+++ b/src/AksArc/AksArc.Autorest/custom/New-AzAksArcCluster.ps1
@@ -475,6 +475,8 @@ function New-AzAksArcCluster {
             $null = $PSBoundParameters.Add("LicenseProfileAzureHybridBenefit", $false)
         }
         $null = $PSBoundParameters.Remove("EnableAzureHybridBenefit")
+        $null = $PSBoundParameters.Remove("NodeTaint")
+        $null = $PSBoundParameters.Remove("NodeLabel")
         Az.AksArc.internal\New-AzAksArcCluster @PSBoundParameters
     }
     }