Fixed some problems with task completion tracking in builder