diff --git a/build.gradle b/build.gradle
index da2e31ee8..43593c46d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
   }
   dependencies {
     classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0'
-    classpath 'com.palantir.baseline:gradle-baseline-java:4.0.0'
+    classpath 'com.palantir.baseline:gradle-baseline-java:4.40.0'
     classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
     classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.8.0'
     classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
diff --git a/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java b/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java
index cc137b3ed..9f0643181 100644
--- a/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java
+++ b/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java
@@ -55,6 +55,7 @@
 
 // inspired in part by
 // https://github.com/apache/avro/blob/release-1.8.2/lang/java/guava/src/main/java/org/apache/avro/GuavaClasses.java
+@SuppressWarnings("ReturnValueIgnored")
 public class GuavaClasses {
 
   /*
diff --git a/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java b/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
index 0090f091d..d54d4de63 100644
--- a/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
+++ b/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
+import jline.internal.Log;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.common.StatsSetupConst;
 import org.apache.hadoop.hive.metastore.IMetaStoreClient;
@@ -568,9 +569,12 @@ protected long acquireLock() throws UnknownHostException, TException, Interrupte
             Lists.newArrayList(lockComponent),
             System.getProperty("user.name"),
             InetAddress.getLocalHost().getHostName());
+    LOG.warn("In thread {}, trying to call hmsclient.lock() on table {}", Thread.currentThread(), fullName);
     LockResponse lockResponse = metaClients.run(client -> client.lock(lockRequest));
+    LOG.warn("In thread {}, hmsclient.lock() finished on table {}", Thread.currentThread(), fullName);
     AtomicReference<LockState> state = new AtomicReference<>(lockResponse.getState());
     long lockId = lockResponse.getLockid();
+    LOG.warn("In thread {}, lockId returned from hmsclient.lock() on table {} is {}", Thread.currentThread(), fullName, lockId);
 
     final long start = System.currentTimeMillis();
     long duration = 0;
@@ -663,6 +667,9 @@ private void unlock(Optional<Long> lockId) {
         LOG.warn("Failed to unlock {}.{}", database, tableName, e);
       }
     }
+    else {
+      LOG.warn("No lockId to unlock for {}.{}", database, tableName);
+    }
   }
 
   @VisibleForTesting
diff --git a/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingCatalog.java b/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingCatalog.java
index a6f1c9585..257f0e797 100644
--- a/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingCatalog.java
+++ b/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingCatalog.java
@@ -37,7 +37,7 @@
  */
 public class HiveMetadataPreservingCatalog extends HiveCatalog {
 
-  private static final String DEFAULT_NAME = "hive_meta_preserving";
+  private static final String DEFAULT_NAME = "hive_meta_preserving_catalog";
 
   public HiveMetadataPreservingCatalog() {}
 
diff --git a/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingTableOperations.java b/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingTableOperations.java
index 0c5b92bd4..1d262435d 100644
--- a/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingTableOperations.java
+++ b/hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingTableOperations.java
@@ -195,7 +195,9 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
     ReentrantLock tableLevelMutex = commitLockCache.get(fullName, t -> new ReentrantLock(true));
     tableLevelMutex.lock();
     try {
+      LOG.warn("In thread {}, starting to create a lock for table {}", Thread.currentThread(), fullName);
       lockId = Optional.of(acquireLock());
+      LOG.warn("In thread {}, acquired lock id: {} for table {}", Thread.currentThread(), lockId.get(), fullName);
       // TODO add lock heart beating for cases where default lock timeout is too low.
       Table tbl;
       // [LINKEDIN] Instead of checking if base != null to check for table existence, we query
@@ -203,9 +205,13 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
       // base can be null if not Iceberg metadata exists, but Hive table exists, so we want to get
       // the current table
       // definition and not create a new definition
+      LOG.warn("In thread {}, checking if table exists {}", Thread.currentThread(), fullName);
       boolean tableExists = metaClients.run(client -> client.tableExists(database, tableName));
+      LOG.warn("In thread {}, checking table exists finishes with result: {}", Thread.currentThread(), tableExists);
       if (tableExists) {
+        LOG.warn("In thread {}, starting to get table {} from HMS", Thread.currentThread(), fullName);
         tbl = metaClients.run(client -> client.getTable(database, tableName));
+        LOG.warn("In thread {}, got table {} from HMS", Thread.currentThread(), fullName);
         fixMismatchedSchema(tbl);
       } else {
         final long currentTimeMillis = System.currentTimeMillis();
@@ -243,7 +249,9 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
       updateMetadataLocationInHms(newMetadataLocation, tbl);
 
       try {
+        LOG.warn("In thread {}, starting to persist table {}", Thread.currentThread(), fullName);
         persistTable(tbl, tableExists);
+        LOG.warn("In thread {}, persisted table {}", Thread.currentThread(), fullName);
         commitStatus = CommitStatus.SUCCESS;
       } catch (Throwable persistFailure) {
         LOG.error(
@@ -280,7 +288,9 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
       throw new RuntimeException("Interrupted during commit", e);
 
     } finally {
+      LOG.warn("In thread {}, trying to cleanupMetadataAndUnlock of lock id: {} for table: {}", Thread.currentThread(), lockId, fullName);
       cleanupMetadataAndUnlock(commitStatus, newMetadataLocation, lockId, tableLevelMutex);
+      LOG.warn("In thread {}, cleanupMetadataAndUnlock finishes for table: {}", Thread.currentThread(), fullName);
     }
   }