Final post-merge fixes.