fix other CR comments