Fixed some things I broke in the merge.