508 scan fixes