re #7200 minor corrections