[v6r10] Another round of fixes...

More might come