JC-1740 Fixes after code review.