- more multibattery fixes