fixes from timeout and interrupted issue on netty