General fixes in TRDS implementation

Change-Id: I0e82c175ee3a2b49fdebd1c94c549b6185306c80