CLC-1667 Minor changes per Yu-Hung's feedback