Bring forward v3 fixes