Rebase Battery fixes