Fixup from merge out