Additional merge fixes.