Improved scan diagnostics