Scrub collision fixes