More fixes for sweep