Corrections after code review