Fix expiry data type