Minor housekeeping changes