tm: minor changes