More expiration tweaks.