Small tweaks to scanner