Update events (fixes #551 #568)