re #784 - Minor changes