Fix chartbeat
Update to latest from remote work