Fix : Battery misc issue