some minor adjustments to PR 349