Updates in line with comments against PR 362.