Fixed issues with shard registry