Possibly fixes, BatteryService