Miscellaneous changes.