Some minor housekeeping