Make stopping a scraper more reliable

These worked on my development instance to make stopping a scraper more reliable.

I can't see any scrapers that have this problem in production right now to test however.