scrap fixes