Fix expire time bugs