diff --git a/src/main/java/com/gerritforge/gerrit/eventbroker/EventGsonProvider.java b/src/main/java/com/gerritforge/gerrit/eventbroker/EventGsonProvider.java
index ff38d5c..be548fa 100644
--- a/src/main/java/com/gerritforge/gerrit/eventbroker/EventGsonProvider.java
+++ b/src/main/java/com/gerritforge/gerrit/eventbroker/EventGsonProvider.java
@@ -52,7 +52,7 @@
     }
   }
 
-  public class ProjectNameKeyDeserializer implements JsonDeserializer<Project.NameKey> {
+  public static class ProjectNameKeyDeserializer implements JsonDeserializer<Project.NameKey> {
 
     @Override
     public Project.NameKey deserialize(
diff --git a/src/main/java/com/gerritforge/gerrit/eventbroker/InProcessBrokerApi.java b/src/main/java/com/gerritforge/gerrit/eventbroker/InProcessBrokerApi.java
index 894e4ed..c8daa0e 100644
--- a/src/main/java/com/gerritforge/gerrit/eventbroker/InProcessBrokerApi.java
+++ b/src/main/java/com/gerritforge/gerrit/eventbroker/InProcessBrokerApi.java
@@ -89,7 +89,7 @@
     }
   }
 
-  private class EventBusMessageRecorder {
+  private static class EventBusMessageRecorder {
     private EvictingQueue messagesQueue;
 
     public EventBusMessageRecorder(EvictingQueue messagesQueue) {