#JC-1198. Fixes after review.