diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
index 381ebfa1811..187f45c3505 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
@@ -223,7 +223,7 @@ private void processError(Throwable t) {
         }
 
         Status status = Status.fromThrowable(t);
-        if (this.isHaltError(status) || this.isNoLeaderError(status)) {
+        if (EtcdWatchClient.isHaltError(status) || EtcdWatchClient.isNoLeaderError(status)) {
             this.notifyWatchers(toEtcdException(status));
             this.closeGrpcWatchStreamObserver();
             this.cancelSet.clear();
@@ -291,7 +291,7 @@ private void processCreate(WatchResponse response) {
     private Optional<WatchRequest> nextResume() {
         EtcdWatcher pendingWatcher = this.pendingWatchers.peek();
         if (pendingWatcher != null) {
-            return Optional.of(this.toWatchCreateRequest(pendingWatcher));
+            return Optional.of(EtcdWatchClient.toWatchCreateRequest(pendingWatcher));
         }
         return Optional.empty();
     }
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/lock/ZKSessionLock.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/lock/ZKSessionLock.java
index e776ee90e19..e88912d4fc6 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/lock/ZKSessionLock.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/lock/ZKSessionLock.java
@@ -924,7 +924,7 @@ private void claimOwnership(int lockEpoch) {
     private void unlockInternal(final CompletableFuture<Void> promise) {
 
         // already closed or expired, nothing to cleanup
-        this.epochUpdater.incrementAndGet(this);
+        ZKSessionLock.epochUpdater.incrementAndGet(this);
         if (null != watcher) {
             this.zkClient.unregister(watcher);
         }