BZ968 - DII fixed and logging fix.