Minor bug fixes in the netty impl