Crash fix and more scanning