diff --git a/common/src/main/java/io/netty/util/DefaultAttributeMap.java b/common/src/main/java/io/netty/util/DefaultAttributeMap.java
index dcbebf54bf..648c2994b9 100644
--- a/common/src/main/java/io/netty/util/DefaultAttributeMap.java
+++ b/common/src/main/java/io/netty/util/DefaultAttributeMap.java
@@ -32,6 +32,7 @@ public class DefaultAttributeMap implements AttributeMap {
             map = this.map = new IdentityHashMap<AttributeKey<?>, Attribute<?>>(2);
         }
 
+        @SuppressWarnings("unchecked")
         Attribute<T> attr = (Attribute<T>) map.get(key);
         if (attr == null) {
             attr = new DefaultAttribute<T>();
diff --git a/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java b/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
index 8cd5c05520..86d51c6cc0 100644
--- a/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
+++ b/transport/src/main/java/io/netty/bootstrap/AbstractBootstrap.java
@@ -153,7 +153,9 @@ public abstract class AbstractBootstrap<B extends AbstractBootstrap<?>> {
             attrs.put(key, value);
         }
 
-        return (B) this;
+        @SuppressWarnings("unchecked")
+        B b = (B) this;
+        return b;
     }
 
     /**
diff --git a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
index 84e5d4a7e2..232f642267 100644
--- a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
+++ b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
@@ -173,7 +173,9 @@ public class ServerBootstrap extends AbstractBootstrap<ServerBootstrap> {
         }
 
         for (Entry<AttributeKey<?>, Object> e: attrs().entrySet()) {
-            channel.attr((AttributeKey<Object>) e.getKey()).set(e.getValue());
+            @SuppressWarnings("unchecked")
+            AttributeKey<Object> key = (AttributeKey<Object>) e.getKey();
+            channel.attr(key).set(e.getValue());
         }
 
         ChannelPipeline p = future.channel().pipeline();
diff --git a/transport/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java
index 3b4708ec18..89ebdc5e88 100644
--- a/transport/src/main/java/io/netty/channel/AbstractChannel.java
+++ b/transport/src/main/java/io/netty/channel/AbstractChannel.java
@@ -278,8 +278,9 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
     }
 
     @Override
-    public MessageBuf<Object> outboundMessageBuffer() {
-        return pipeline.outboundMessageBuffer();
+    @SuppressWarnings("unchecked")
+    public <T> MessageBuf<T> outboundMessageBuffer() {
+        return (MessageBuf<T>) pipeline.outboundMessageBuffer();
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/AbstractServerChannel.java b/transport/src/main/java/io/netty/channel/AbstractServerChannel.java
index 03d42ead89..146b3842f3 100755
--- a/transport/src/main/java/io/netty/channel/AbstractServerChannel.java
+++ b/transport/src/main/java/io/netty/channel/AbstractServerChannel.java
@@ -49,7 +49,7 @@ public abstract class AbstractServerChannel extends AbstractChannel implements S
     }
 
     @Override
-    public MessageBuf<Object> outboundMessageBuffer() {
+    public <T> MessageBuf<T> outboundMessageBuffer() {
         throw new NoSuchBufferException(String.format(
                 "%s does not have an outbound buffer.", ServerChannel.class.getSimpleName()));
     }
diff --git a/transport/src/main/java/io/netty/channel/ChannelPipeline.java b/transport/src/main/java/io/netty/channel/ChannelPipeline.java
index f33595dce0..adbb5f2101 100644
--- a/transport/src/main/java/io/netty/channel/ChannelPipeline.java
+++ b/transport/src/main/java/io/netty/channel/ChannelPipeline.java
@@ -205,9 +205,9 @@ import java.util.NoSuchElementException;
  */
 public interface ChannelPipeline extends ChannelInboundInvoker, ChannelOutboundInvoker {
 
-    MessageBuf<Object> inboundMessageBuffer();
+    <T> MessageBuf<T> inboundMessageBuffer();
     ByteBuf inboundByteBuffer();
-    MessageBuf<Object> outboundMessageBuffer();
+    <T> MessageBuf<T> outboundMessageBuffer();
     ByteBuf outboundByteBuffer();
 
     /**
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
index 9c2519a87d..d5286af6e6 100755
--- a/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
@@ -355,7 +355,9 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
         } else if (buf instanceof MessageBuf) {
             outByteBuf = null;
             outByteBridge = null;
-            outMsgBuf = (MessageBuf<Object>) buf;
+            @SuppressWarnings("unchecked")
+            MessageBuf<Object> msgBuf = (MessageBuf<Object>) buf;
+            outMsgBuf = msgBuf;
             outMsgBridge = new AtomicReference<MessageBridge>();
         } else {
             throw new Error();
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
index 42409f6a97..9ee977d985 100755
--- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
@@ -844,8 +844,9 @@ public class DefaultChannelPipeline implements ChannelPipeline {
     }
 
     @Override
-    public MessageBuf<Object> inboundMessageBuffer() {
-        return head.nextInboundMessageBuffer();
+    @SuppressWarnings("unchecked")
+    public <T> MessageBuf<T> inboundMessageBuffer() {
+        return (MessageBuf<T>) head.nextInboundMessageBuffer();
     }
 
     @Override
@@ -854,8 +855,9 @@ public class DefaultChannelPipeline implements ChannelPipeline {
     }
 
     @Override
-    public MessageBuf<Object> outboundMessageBuffer() {
-        return nextOutboundMessageBuffer(tail);
+    @SuppressWarnings("unchecked")
+    public <T> MessageBuf<T> outboundMessageBuffer() {
+        return (MessageBuf<T>) nextOutboundMessageBuffer(tail);
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioEventLoop.java b/transport/src/main/java/io/netty/channel/socket/nio/NioEventLoop.java
index aa634a8857..4da88f787b 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioEventLoop.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioEventLoop.java
@@ -306,7 +306,9 @@ public final class NioEventLoop extends SingleThreadEventLoop {
                 if (a instanceof AbstractNioChannel) {
                     processSelectedKey(k, (AbstractNioChannel) a);
                 } else {
-                    processSelectedKey(k, (NioTask<SelectableChannel>) a);
+                    @SuppressWarnings("unchecked")
+                    NioTask<SelectableChannel> task = (NioTask<SelectableChannel>) a;
+                    processSelectedKey(k, task);
                 }
 
                 if (cleanedCancelledKeys) {
@@ -376,7 +378,9 @@ public final class NioEventLoop extends SingleThreadEventLoop {
                 channels.add((Channel) a);
             } else {
                 k.cancel();
-                invokeChannelUnregistered((NioTask<SelectableChannel>) a, k);
+                @SuppressWarnings("unchecked")
+                NioTask<SelectableChannel> task = (NioTask<SelectableChannel>) a;
+                invokeChannelUnregistered(task, k);
             }
         }