#1557 - minor fixes