More minor housekeeping