More 6.1 fixes