Fixes suggested by PR review - thanks chaps..

Minor updates fixing things pointed out by @mariogiov