Add @horst-n PR #475, plus a few other minor adjustments