Cleaning up some changes from the merge