fixes for the expiration time -- we're behaving as desired.