Address issues related to Tasks