More fixes to battery indicator