Fixes/string updates to TSDX removal