battery minor fixes