fix compat layer, add balance handler to account watcher