Fix CR review