refs #1705 : Minor fixes...