Dscanner fix
Dscanner fixes