Update events (fixes #684)