Various minor changes.