CLC-3921 Changes per code review; make Travis happy