Fix issues due to last merge.