Some miscellaneous changes.