diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java
index 6e362f02fec8..1c776b206143 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java
@@ -393,7 +393,7 @@ private void updatePartitionStatisticsBatch(Table table, Map<String, Function<Pa
                             .withDatabaseName(table.getDatabaseName())
                             .withTableName(table.getTableName())
                             .withEntries(partitionUpdateRequestsPartition),
-                    new StatsRecordingAsyncHandler(stats.getBatchUpdatePartition(), startTimestamp)));
+                    new StatsRecordingAsyncHandler<>(stats.getBatchUpdatePartition(), startTimestamp)));
         });
 
         try {
@@ -885,7 +885,7 @@ private List<Partition> batchGetPartition(Table table, List<String> partitionNam
                                     .withDatabaseName(table.getDatabaseName())
                                     .withTableName(table.getTableName())
                                     .withPartitionsToGet(partitions),
-                            new StatsRecordingAsyncHandler(stats.getGetPartitions(), startTimestamp)));
+                            new StatsRecordingAsyncHandler<>(stats.getGetPartitions(), startTimestamp)));
                 }
                 pendingPartitions.clear();
 
@@ -933,7 +933,7 @@ public void addPartitions(String databaseName, String tableName, List<PartitionW
                                     .withDatabaseName(databaseName)
                                     .withTableName(tableName)
                                     .withPartitionInputList(partitionInputs),
-                            new StatsRecordingAsyncHandler(stats.getBatchCreatePartition(), startTime)));
+                            new StatsRecordingAsyncHandler<>(stats.getBatchCreatePartition(), startTime)));
                 }
 
                 for (Future<BatchCreatePartitionResult> future : futures) {
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
index cb12806bfeff..85560439909a 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/DynamicTableBuilder.java
@@ -267,12 +267,12 @@ private static Map<String, PinotColumnNameAndTrinoType> getAggregateTypes(Schema
     // Extracted from org.apache.pinot.core.query.reduce.AggregationDataTableReducer
     private static DataSchema getPreAggregationDataSchema(QueryContext queryContext)
     {
-        AggregationFunction[] aggregationFunctions = queryContext.getAggregationFunctions();
+        AggregationFunction<?, ?>[] aggregationFunctions = queryContext.getAggregationFunctions();
         int numAggregationFunctions = aggregationFunctions.length;
         String[] columnNames = new String[numAggregationFunctions];
         DataSchema.ColumnDataType[] columnDataTypes = new DataSchema.ColumnDataType[numAggregationFunctions];
         for (int i = 0; i < numAggregationFunctions; i++) {
-            AggregationFunction aggregationFunction = aggregationFunctions[i];
+            AggregationFunction<?, ?> aggregationFunction = aggregationFunctions[i];
             columnNames[i] = aggregationFunction.getResultColumnName();
             columnDataTypes[i] = aggregationFunction.getFinalResultColumnType();
         }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
index a960fc16f62a..87d5d832a075 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
@@ -651,14 +651,14 @@ else if (isExplain) {
             queryAssertion.accept(actual.getQueryId());
         }
 
-        public FailureRecoveryAssert failsAlways(Consumer<AbstractThrowableAssert> failureAssertion)
+        public FailureRecoveryAssert failsAlways(Consumer<AbstractThrowableAssert<?, ? extends Throwable>> failureAssertion)
         {
             failsWithoutRetries(failureAssertion);
             failsDespiteRetries(failureAssertion);
             return this;
         }
 
-        public FailureRecoveryAssert failsWithoutRetries(Consumer<AbstractThrowableAssert> failureAssertion)
+        public FailureRecoveryAssert failsWithoutRetries(Consumer<AbstractThrowableAssert<?, ? extends Throwable>> failureAssertion)
         {
             verifyFailureTypeAndStageSelector();
             OptionalInt failureStageId = getFailureStageId(() -> executeExpected().getQueryResult());
@@ -666,7 +666,7 @@ public FailureRecoveryAssert failsWithoutRetries(Consumer<AbstractThrowableAsser
             return this;
         }
 
-        public FailureRecoveryAssert failsDespiteRetries(Consumer<AbstractThrowableAssert> failureAssertion)
+        public FailureRecoveryAssert failsDespiteRetries(Consumer<AbstractThrowableAssert<?, ? extends Throwable>> failureAssertion)
         {
             verifyFailureTypeAndStageSelector();
             OptionalInt failureStageId = getFailureStageId(() -> executeExpected().getQueryResult());