Fix up scrapping