(Issue 581) Updates from self review