Update events (fixes #676)