Interaction fixes for scrubber for new something something