Fix issues in last merge.