508 Scan fixes and Appscan fixes