More post-merge changes