Subtask addition fixes