Update events (fixes #674)