Fixed some errors after the merge.