fixes to task service