Update events (fixes #613, #614)