Fixed a few errors in the merge