Fix a few files that do not seem to have merged properly.