Few minor things were forgotten adding TS capabilities.