Merge assorted fixes from 3.2