Fixes for the scan
Fixes for the Scan
Fixes for the Scan