Scraper bugfixes for mwave