JC-1507 Fixed code review notices.