Minor fixes to battery