Adjust for latest netty master changes