[v6r10] Minor fixes v6r10