Fixed and tweaked Scan/ScanAll methods