More scanner tweaks