Fix battery watcher