Bit of work towards #587 and fix #573