Miscellaneous minor changes.