Appscan fixes