Simple fixes for TR