Another part from "fb: TRDS some tweaks and fixes"