Separated disruptor client, small fixes