TSS fixes and updates