Version 3.1 housekeeping.