fixes to tm