Battery Friend: Fix and cleanup from prior commits