CLC-3921 Small changes per code review