TSDX fixes (final)