Enum extension + some other scraping fixes