Fixes for battery widget