Fix a couple of minor merge issues