Changes from comments in PR #385