Fixes for sweep workers