Fix up task/TaskManager integration.