[v7r0] Several fixes