Minor updates to TSS and dispose method.