battery-control: misc changes to fix build errors from 3eed3ff