[v6r10] Minor fixes