diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
index 070205c665f0..3f30e98876d6 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
@@ -125,6 +125,7 @@
 import static io.trino.plugin.hive.util.HiveUtil.isStructuralType;
 import static io.trino.plugin.iceberg.ColumnIdentity.primitiveColumnIdentity;
 import static io.trino.plugin.iceberg.ExpressionConverter.toIcebergExpression;
+import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR;
 import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isProjectionPushdownEnabled;
 import static io.trino.plugin.iceberg.IcebergSessionProperties.isStatisticsEnabled;
@@ -629,7 +630,7 @@ private void cleanExtraOutputFiles(HdfsContext hdfsContext, String queryId, Stri
             }
         }
         catch (IOException e) {
-            throw new TrinoException(IcebergErrorCode.ICEBERG_FILESYSTEM_ERROR,
+            throw new TrinoException(ICEBERG_FILESYSTEM_ERROR,
                     format("Could not clean up extraneous output files; remaining files: %s", filesToDelete), e);
         }
     }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java
index 10c75744128d..5aec626a006b 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/IcebergOptimizeHandle.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.util.Objects.requireNonNull;
 
 public class IcebergOptimizeHandle
@@ -97,4 +98,18 @@ public boolean isRetriesEnabled()
     {
         return retriesEnabled;
     }
+
+    @Override
+    public String toString()
+    {
+        return toStringHelper(this)
+                .add("schemaAsJson", schemaAsJson)
+                .add("partitionSpecAsJson", partitionSpecAsJson)
+                .add("tableColumns", tableColumns)
+                .add("fileFormat", fileFormat)
+                .add("tableStorageProperties", tableStorageProperties)
+                .add("maxScannedFileSize", maxScannedFileSize)
+                .add("retriesEnabled", retriesEnabled)
+                .toString();
+    }
 }