Small adjustments on the Task API