#JC-1023. Review fixes.