Dscanner fixes