Various small updates that have been accumulating locally. Nothing particularly interesting here.