Fix couple of uses of Punishment.IsExpired