Minor updates to custodian_task.