Improve battery handling.