Issue refs #1429: minor fixes