fix some leftover bugs from Netty transition