Magic Rebalance and Fixes