Fixes for both xtc and trr