diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java
index 0cd07262f9..9e66ca8348 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java
@@ -60,6 +60,7 @@ final class UTF8Output {
             12, 36, 12, 12, 12, 36, 12, 12, 12, 12, 12, 36, 12, 36, 12, 12, 12, 36, 12, 12, 12, 12,
             12, 12, 12, 12, 12, 12 };
 
+    @SuppressWarnings("RedundantFieldInitialization")
     private int state = UTF8_ACCEPT;
     private int codep;
 
diff --git a/common/src/main/java/io/netty/util/HashedWheelTimer.java b/common/src/main/java/io/netty/util/HashedWheelTimer.java
index d06f10d116..0e0015068d 100644
--- a/common/src/main/java/io/netty/util/HashedWheelTimer.java
+++ b/common/src/main/java/io/netty/util/HashedWheelTimer.java
@@ -17,10 +17,10 @@ package io.netty.util;
 
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.monitor.ValueDistributionMonitor;
 import io.netty.monitor.EventRateMonitor;
 import io.netty.monitor.MonitorName;
 import io.netty.monitor.MonitorRegistry;
+import io.netty.monitor.ValueDistributionMonitor;
 import io.netty.util.internal.DetectionUtil;
 import io.netty.util.internal.SharedResourceMisuseDetector;
 
@@ -508,7 +508,7 @@ public class HashedWheelTimer implements Timer {
                         // it to a temporary list - we will reschedule it in a
                         // separate loop.
                         if (slipped == null) {
-                            slipped = new ArrayList<HashedWheelTimer.HashedWheelTimeout>();
+                            slipped = new ArrayList<HashedWheelTimeout>();
                         }
                         slipped.add(timeout);
                     }