More post-merge fixing