Fixes suggested by PR review - thanks chaps..