[TLBB-M6] Performance tweaks from Thomas