[v6r10] Several fixes