Further 1.6 fixes.