Updates for better OAuth2 expiration date handling