Various minor updates.