Fix scavengers