Fixed a couple issues introduced by the merge