[TLBBv2] Small tweaks