Missed several references to tpl in previous update