some fixes on battery