Post-merge fixes.