Moooooore TRDS fixes

Change-Id: Ic4b1bbe1bd60ca56b03e1607b75bd7774bb65ec7