Correct errors which were include in merge.