Some housekeeping changes