AutoSuspendableScanner fixes