Scraper fixes

This fixes two bugs on the scraper. @adieyal can you review & merge?