Added some checks in OnValidate to detect activities that generate notifications that don't auto expire and have no expiry conditions Added an expire time field for critical severity notifications (defaulted to 15, used to be -1) New OnValidate checks picked up Death activity as never expiring, marked it as auto expire/critical severity