re #844 - Minor improvements