Merger: Tweaks to task tracking