Scrub fixes