Netty fixes