various fixups part 2 - issue #291