More 3.2 fixes