Avoid overwriting an s2s command
Fix rehashing not rejoining the services client