Address CR remarks