Some misc. housekeeping.