v3.2 fixes (see changelog)