Various minor updates to fix breakages.