Fix a couple of merge issues that I created.