Further 3.1 fixes