Fixes for some custom battery implementations