diff --git a/core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java b/core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
index 8b6a610..0c8b32a 100644
--- a/core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
+++ b/core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java
@@ -44,16 +44,19 @@
 public final class ExpectationServlet
         extends HttpServlet
 {
-    private final Logger logger = LoggerFactory.getLogger( getClass() );
+    private static final Logger logger = LoggerFactory.getLogger( ExpectationServlet.class );
 
     private static final long serialVersionUID = 1L;
 
     private final String baseResource;
 
+    @SuppressWarnings( "serial" )
     private final Map<String, ContentResponse> expectations = new HashMap<>();
 
+    @SuppressWarnings( "serial" )
     private final Map<String, Integer> accessesByPath = new HashMap<>();
 
+    @SuppressWarnings( "serial" )
     private final Map<String, ContentResponse> errors = new HashMap<>();
 
     public ExpectationServlet()
@@ -273,4 +276,4 @@ public Integer getAccessesFor( final String method, final String path )
         return accessesByPath.get( getAccessKey( method, path ) );
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/commonjava/test/http/stream/StreamServlet.java b/core/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
index e7569d9..c248f75 100644
--- a/core/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
+++ b/core/src/main/java/org/commonjava/test/http/stream/StreamServlet.java
@@ -36,12 +36,14 @@
 public final class StreamServlet
         extends HttpServlet
 {
-    private final Logger logger = LoggerFactory.getLogger( getClass() );
+    private static final Logger logger = LoggerFactory.getLogger( StreamServlet.class );
 
     private static final long serialVersionUID = 1L;
 
+    @SuppressWarnings( "serial" )
     private final Map<String, Integer> accessesByPath = new HashMap<>();
 
+    @SuppressWarnings( "serial" )
     private StreamResolver resolver;
 
     public StreamServlet()
@@ -139,4 +141,4 @@ public Integer getAccessesFor( final String method, final String path )
         return accessesByPath.get( getAccessKey( method, path ) );
     }
 
-}
\ No newline at end of file
+}