Rebuild after making corrections as per HN comment