Fixed a couple of errors from Mergetool