Make corrections as per HN comment