Some improvements to the additions from pull #1234
3 files changed