[v6r10] Round of fixes...number 5