Fixed a few things that broke in the merge