CURATNTOOL-1058 Appscan fixes