couple more housekeeping things