Updated a few key expiry settings