Oracle merge fixed. ExpirationManager fixed. (for oracle).
More Oracle fixes.