Small housekeeping changes.