more tr fixes