Minor improvements to get recent talks working.