more shard rebalancer fixes