Assorted small local updates.