rebalance misc fixes