Battery tweaks