[v6r10] Other fixes...