Re #10705 Minor improvements