Small rebalance, small fixes.