some 3.2 fixes