more tweaks to key expiration