508 Scan fixes