Fix issues with latest merge.