diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java
index 2e337f515469..1036b1fea29c 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java
+++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java
@@ -130,7 +130,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
             LanguageTarget target
     ) {
         ServiceShape service = settings.getService(model);
-        Map<String, Consumer<TypeScriptWriter>> runtimeConfigs = new HashMap();
+        Map<String, Consumer<TypeScriptWriter>> runtimeConfigs = new HashMap<>();
         if (isAwsService(service) && target.equals(LanguageTarget.SHARED)) {
             String serviceId = service.expectTrait(ServiceTrait.class).getSdkId();
             runtimeConfigs.put("serviceId", writer -> writer.write("$S", serviceId));
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java
index 336879091c94..5cff4f44a732 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java
+++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java
@@ -192,7 +192,7 @@ private static Map<String, Object> getPluginFunctionParams(
             serviceShape, operationShape));
 
         OperationIndex operationIndex = OperationIndex.of(model);
-        List membersWithClientEndpointDiscoveryId = getMembersWithClientEndpointDiscoveryId(
+        List<MemberShape> membersWithClientEndpointDiscoveryId = getMembersWithClientEndpointDiscoveryId(
             operationIndex.getInput(operationShape)
         );
 
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
index 989dab73e96c..f4a534de7834 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
+++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
@@ -293,7 +293,7 @@ static Map<String, TreeSet<String>> getErrorAliases(GenerationContext context,
         boolean awsQueryCompatible = service.hasTrait(AwsQueryCompatibleTrait.class);
         if (awsQueryCompatible) {
             for (OperationShape operation : operations) {
-                List<ShapeId> errors = operation.getErrors();
+                Set<ShapeId> errors = operation.getErrorsSet();
                 for (ShapeId error : errors) {
                     Shape errorShape = context.getModel().expectShape(error);
                     if (errorShape.hasTrait(AwsQueryErrorTrait.class)) {
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java
index 61bbc80fd084..33a072793ff1 100644
--- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java
+++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsQuery.java
@@ -215,7 +215,7 @@ public void generateProtocolTests(GenerationContext context) {
     public Map<String, ShapeId> getOperationErrors(GenerationContext context, OperationShape operation) {
         Map<String, ShapeId> errors = new TreeMap<>();
 
-        operation.getErrors().forEach(shapeId -> {
+        operation.getErrorsSet().forEach(shapeId -> {
             Shape errorShape = context.getModel().expectShape(shapeId);
             String errorName = shapeId.getName(context.getService());