It seems to have worked.
bnf still shows slightly different values, but at least the standard battery indicator is making sense now (currently 66% from bnf and 58% from indicator).