Fixed a couple of other merge issues