Battery life improvements