Update events (fixes #641, #643)