Fixes for Netty Implementation