Fixes on TSMessages - Closes #130