Fixing issues to go with the scrapper