Improve TSDX again