Fixed a few things from the merge