Update events (fixes #690, fixes #687, fixes #686, fixes #659)