[TLBB] Small fixes