Minor work towards re-enabling tasks.