Further v7 fixes