Two small fixes to the Battery Module

Two small errors seem to have been introduced recently to the `Battery` module.