FIX - autoscan and scan optimizations