Fix code review notes