Incorporate feedback on PR #928