Scan aborting and bug fixes.