diff --git a/server/src/main/java/com/hedera/block/server/Server.java b/server/src/main/java/com/hedera/block/server/Server.java
index 5b27d510c..0a1bb4282 100644
--- a/server/src/main/java/com/hedera/block/server/Server.java
+++ b/server/src/main/java/com/hedera/block/server/Server.java
@@ -16,6 +16,7 @@
 
 package com.hedera.block.server;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 
 /** Main class for the block node server */
@@ -34,9 +35,10 @@ public static void main(final String[] args) {
 
         LOGGER.log(System.Logger.Level.INFO, "Starting BlockNode Server");
 
-        BlockNodeAppServerInjectionComponent daggerComponent =
+        @NonNull
+        final BlockNodeAppServerInjectionComponent daggerComponent =
                 DaggerBlockNodeAppServerInjectionComponent.create();
-        BlockNodeApp server = daggerComponent.getBlockNodeAppServer();
+        @NonNull final BlockNodeApp server = daggerComponent.getBlockNodeAppServer();
 
         try {
             server.startServer();
diff --git a/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java b/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java
index 1077a1f2e..db882c9bb 100644
--- a/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/health/HealthInjectionModule.java
@@ -28,7 +28,8 @@
 @Module
 public interface HealthInjectionModule {
 
-    /** Binds the health service to the health service implementation.
+    /**
+     * Binds the health service to the health service implementation.
      *
      * @param healthService needs a health service implementation
      * @return the health service implementation