Fixed some small changes that came from the merge