Battery Fixes