Fix deadlock and rebind issue with Riak cluster