Corrections after latest code review