Fixed battery saves to be more consistent