More fixes for tasksync