TrM: some interface fixes