Re #10681 Minor comments and bugs found while changing system tests