Some tpa fixes