[TLBB-M3] Performance tweaks from Thomas