Some housekeeping changes.