Fixed some things that failed during the merge.