Minor housekeeping...