Fixed some errors caused by the merge.