A couple of minor fixes in the Tbr stuff