scan fixes