Small TMS updates