Final urlScrape fixes?