Lifetime highlighting fixes