Minor changes for housekeeping