Integrate updates from Claudia.