Fixup battery and some other bits