ScanAssets fixes