[v6r10] Other various simple fixes

... to be continued, probably