Changes required to match Netty upstream/master