Fixes, changes and autobalance