Bug fixes for new scrubbing interface