Fixed mistakes made during merge.